sasat 0.14.1 → 0.14.4

package/lib/cli/commands/createMigration.js

@@ -4,10 +4,9 @@ import { config } from '../../config/config.js';
 import { capitalizeFirstLetter } from '../../util/stringUtil.js';
 import { mkDirIfNotExist } from '../../util/fsUtil.js';
 import { Console } from '../console.js';
-const getMigrationFile = (className) => `import { SasatMigration } from "sasat";
-import { MigrationStore } from "sasat";
+const getMigrationFile = (className) => `import { SasatMigration, MigrationStore } from "sasat";
 
-export class ${capitalizeFirstLetter(className)} implements SasatMigration {
+class ${capitalizeFirstLetter(className)} implements SasatMigration {
   
   up: (store: MigrationStore) => void = store => {
 
@@ -18,6 +17,10 @@ export class ${capitalizeFirstLetter(className)} implements SasatMigration {
   };
 }
 
+
+// DO NOT EDIT (last line is used)
+new ${capitalizeFirstLetter(className)}()
+
 `;
 export const createMigrationFile = (migrationName) => {
     const date = new Date();

package/lib/config/loader.js

@@ -1,5 +1,5 @@
-import * as path from 'path';
-import * as fs from 'fs';
+import path from 'path';
+import fs from 'fs-extra';
 import { defaultConf } from './config.js';
 import { readYmlFile } from '../util/fsUtil.js';
 export class SasatConfigLoader {

package/lib/constants/directory.js

@@ -4,7 +4,7 @@ const EntityDirName = 'entities';
 const DataSourceDirName = 'dataSources';
 const GeneratedDataSourceDirName = 'dataSources';
 const relative = (from, to) => {
-    const result = path.relative(from, to);
+    const result = path.posix.relative(from, to);
     if (result.startsWith('../'))
         return result;
     return './' + result;

package/lib/generator/ts/code/importDeclaration.js

@@ -4,6 +4,6 @@ export class ImportDeclaration {
         this.module = module;
     }
     toString() {
-        return `import {${this.types.join(',')}} from "${this.module}";`;
+        return `import {${this.types.join(',')}} from "${this.module.startsWith('.') ? this.module + '.js' : this.module}";`;
     }
 }

package/lib/generator/ts/gql/queryGenerator.js

@@ -4,8 +4,8 @@ import { tsg } from '../code/factory.js';
 export class QueryGenerator {
     generate(nodes) {
         return new TsFile(tsg
-            .variable('const', tsg.identifier('query'), tsg.object(...nodes.flatMap(node => this.entity(node))), tsg.typeRef('IResolverObject').importFrom('graphql-tools'))
-            .export());
+            .variable('const', tsg.identifier('query'), tsg.object(...nodes.flatMap(node => this.entity(node))), tsg.typeRef('IResolvers').importFrom('@graphql-tools/utils/Interfaces'))
+            .export()).addImport(['GraphQLResolveInfo'], 'graphql');
     }
     entity(node) {
         const createParams = (query) => {
@@ -14,14 +14,14 @@ export class QueryGenerator {
                     tsg.parameter('_1', tsg.typeRef('unknown')),
                     tsg.parameter('_2', tsg.typeRef('unknown')),
                     tsg.parameter('_3', tsg.typeRef('unknown')),
-                    tsg.parameter('info'),
+                    tsg.parameter('info', tsg.typeRef('GraphQLResolveInfo')),
                 ];
             const paramNames = query.queryParams.map(it => it.name);
             return [
                 tsg.parameter('_1', tsg.typeRef('unknown')),
                 tsg.parameter(`{ ${paramNames.join(',')} }`, node.entityName.getTypeReference(Directory.paths.generated).pick(...paramNames)),
                 tsg.parameter('_2', tsg.typeRef('unknown')),
-                tsg.parameter('info'),
+                tsg.parameter('info', tsg.typeRef('GraphQLResolveInfo')),
             ];
         };
         return node.queries.map(it => tsg.propertyAssign(it.queryName, tsg.arrowFunc(createParams(it), undefined, tsg

package/lib/generator/ts/staticFiles.js

@@ -1,17 +1,16 @@
 const contextFile = `\
-import { BaseGqlContext } from './__generated__/context';
+import { BaseGqlContext } from './__generated__/context.js';
 export interface GqlContext extends BaseGqlContext {}
 `;
 const pubsubFile = `\
-import { PubSub } from "apollo-server";
-import { PubSubEngine } from "graphql-subscriptions";
+import { PubSub, PubSubEngine } from "graphql-subscriptions";
 
 export const pubsub: PubSubEngine = new PubSub();
 `;
 const schemaFile = `\
 import { assignDeep, createTypeDef } from "sasat";
-import { typeDef } from "./__generated__/typeDefs";
-import { resolvers } from "./__generated__/resolver";
+import { typeDef } from "./__generated__/typeDefs.js";
+import { resolvers } from "./__generated__/resolver.js";
 
 export const schema = {
   typeDefs: createTypeDef(assignDeep(typeDef, {})),
@@ -19,8 +18,8 @@ export const schema = {
 };
 `;
 const baseDBDataSourceFile = `\
-import { Fields, SasatRepository } from '../../src';
-import { dataStoreInfo } from './__generated__/relationMap';
+import { Fields, SasatRepository } from 'sasat';
+import { dataStoreInfo } from './__generated__/relationMap.js';
 
 
 export abstract class BaseDBDataSource<Entity, Creatable, Identifiable, EntityFields extends Fields> extends SasatRepository<

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.14.1",
+  "version": "0.14.4",
   "repository": "https://github.com/yanokunpei/sasat.git",
   "author": "yanokunpei <ninian138@gmail.com>",
   "license": "MIT",
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "start": "env-cmd .env ts-node ./index.ts",
-    "build": "rm -rf ./lib && yarn tsc",
+    "build": "yarn tsc",
     "lint": "eslint 'src/**/*.ts'",
     "fmt": "yarn lint --fix && yarn prettier",
     "prettier": "prettier --write './**/*.ts'",
@@ -29,13 +29,15 @@
     "cac": "6.7.12",
     "chalk": "5.0.1",
     "fs-extra": "^10.0.0",
+    "graphql-subscriptions": "^2.0.0",
     "js-yaml": "^4.0.0",
     "mariadb": "^2.1.5",
     "mysql": "^2.17.1",
     "pluralize": "^8.0.0",
     "prettier": "^2.0.0",
     "sqlstring": "^2.3.1",
-    "typescript": "4.6.3"
+    "typescript": "4.6.3",
+    "graphql": "^16.3.0"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.13",
@@ -53,7 +55,6 @@
     "eslint": "8.13.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.0.0",
-    "graphql": "16.3.0",
     "husky": "7.0.4",
     "jest": "27.5.1",
     "lint-staged": "12.3.7",