Merge pull request #39 from ConrabOpto/feature/mst-query-generator-pu…

…blish generator: Fix types and publish info
ConrabOpto · Feb 8, 2023 · 0350627 · 0350627
2 parents 77e4230 + a887df4
commit 0350627
Show file tree

Hide file tree

Showing 7 changed files with 1,926 additions and 8,876 deletions.
diff --git a/packages/mst-query-generator/generator/generate.ts b/packages/mst-query-generator/generator/generate.ts
@@ -35,6 +35,8 @@ export class Generate implements GenerateProps {
         this.typeHandler = params.typeHandler ? params.typeHandler : defaultTypeHandler;
         this.files = [] as GeneratedFile[];
         this.config = params.config ?? undefined;
+        this.knownTypes = [];
+        this.refs = [];
 
         const excludes = params.excludes ? params.excludes : [];
         this.excludes = [...excludes, ...reservedGraphqlNames];

diff --git a/packages/mst-query-generator/package-lock.json b/packages/mst-query-generator/package-lock.json
diff --git a/packages/mst-query-generator/package.json b/packages/mst-query-generator/package.json
@@ -1,43 +1,42 @@
 {
     "name": "mst-query-generator",
-    "version": "1.0.0-alpha.0",
+    "version": "1.0.2",
     "description": "Code generator for mst-query",
     "source": "src/index.ts",
-    "main": "dist/generate.cjs",
-    "module": "dist/generate.module.js",
-    "type": "module",
+    "main": "dist/src/index.js",
     "target": "node",
+    "bin": {
+        "mst-query-generator": "./dist/src/index.js"
+    },
     "scripts": {
         "watch": "vitest",
         "test": "vitest run",
-        "build": "microbundle --target node --tsconfig tsconfig.build.json --no-compress --external mobx,mobx-state-tree,react,react-dom,graphql"
+        "build": "tsc -p tsconfig.build.json"
     },
     "repository": {
         "type": "git",
         "url": "git+https://github.com/ConrabOpto/mst-query.git"
     },
     "author": "Conrab Opto (www.conrabopto.se)",
     "license": "MIT",
+    "files": [
+        "dist"
+    ],
     "dependencies": {
         "arg": "^5.0.0",
         "camelcase": "^6.2.0",
-        "pluralize": "^8.0.0",
+        "cosmiconfig": "^7.0.0",
         "graphql": "16.6.0",
-        "cosmiconfig": "^7.0.0"
+        "pluralize": "^8.0.0"
     },
     "devDependencies": {
         "@types/graphql": "^14.5.0",
-        "@types/node": "^17.0.38",
+        "@types/node": "^18.13.0",
         "@types/pluralize": "^0.0.29",
-        "microbundle": "^0.13.3",
-        "mobx": "^6.2.0",
-        "mobx-react": "^7.1.0",
-        "mobx-state-tree": "^5.0.1",
+        "nodemon": "^2.0.20",
         "prettier": "^2.2.1",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2",
-        "typescript": "^4.4.4",
-        "mst-query": "1.0.10",
+        "ts-node": "^10.9.1",
+        "typescript": "^4.9.5",
         "vitest": "^0.18.0"
     },
     "volta": {

diff --git a/packages/mst-query-generator/src/index.ts b/packages/mst-query-generator/src/index.ts
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 import run from '../generator/scaffold';
 
 run();
diff --git a/packages/mst-query-generator/src/utils.ts b/packages/mst-query-generator/src/utils.ts
@@ -1,7 +1,7 @@
 import camelcase from 'camelcase';
 import { RootType } from './models';
 
-export const primitiveFieldNames = {
+export const primitiveFieldNames: { [key: string]: string } = {
     ID: 'identifier',
     Int: 'integer',
     String: 'string',

diff --git a/packages/mst-query-generator/tsconfig.build.json b/packages/mst-query-generator/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+    "extends": "./tsconfig.json",    
+    "include": ["./src"]
+}
diff --git a/packages/mst-query-generator/tsconfig.json b/packages/mst-query-generator/tsconfig.json
@@ -1,19 +1,14 @@
 {
     "compilerOptions": {
         "target": "ESNext",
-        "module": "ESNext",
-        "jsx": "react",
-        "lib": ["ESNext", "dom"],
+        "module": "commonjs",
+        "lib": ["es6", "es2015", "dom"],
         "declaration": true,
-        "skipLibCheck": true,
+        "outDir": "dist",
         "strict": true,
-        "noImplicitAny": true,
-        "alwaysStrict": true,
-        "moduleResolution": "node",
-        "experimentalDecorators": true,
-        "downlevelIteration": true,
+        "types": ["node"],
         "esModuleInterop": true,
-        "allowJs": true
+        "resolveJsonModule": true
     },
     "include": ["./src", "./tests"]
 }