sasat 0.14.8 → 0.14.9

package/lib/cli/commands/dumpDb.js

@@ -4,7 +4,7 @@ import { SqlString } from '../../runtime/sql/sqlString.js';
 import { writeYmlFile } from '../../util/fsUtil.js';
 import { DBColumnTypes } from '../../migration/column/columnTypes.js';
 import { config } from '../../config/config.js';
-import { getDbClient } from "../../db/getDbClient.js";
+import { getDbClient } from '../../db/getDbClient.js';
 export const dumpDB = async () => {
     const con = getDbClient();
     try {

package/lib/cli/commands/migrate.js

@@ -4,7 +4,7 @@ import { Parser } from '../../parser/parser.js';
 import { CodeGenerateController } from '../../generator/controller.js';
 import { DataStoreHandler } from '../../migration/dataStore.js';
 import { writeCurrentSchema } from '../../util/fsUtil.js';
-import { getDbClient } from "../../db/getDbClient.js";
+import { getDbClient } from '../../db/getDbClient.js';
 export const migrate = async (options) => {
     let current;
     try {

package/lib/db/connectors/mockClient.d.ts

@@ -1,4 +1,4 @@
-import { DBClient, SQLTransaction } from "./dbClient.js";
+import { DBClient, SQLTransaction } from './dbClient.js';
 declare class MockDBTransaction extends SQLTransaction {
     commit(): Promise<void>;
     protected execSql(): Promise<never[]>;

package/lib/db/connectors/mockClient.js

@@ -1,4 +1,4 @@
-import { DBClient, SQLTransaction } from "./dbClient.js";
+import { DBClient, SQLTransaction } from './dbClient.js';
 class MockDBTransaction extends SQLTransaction {
     commit() {
         return Promise.resolve();

package/lib/db/formatQuery.js

@@ -1,4 +1,4 @@
-import { SqlString } from "../runtime/sql/sqlString.js";
+import { SqlString } from '../runtime/sql/sqlString.js';
 export const formatQuery = (str, ...params) => {
     let ret = str[0];
     for (let i = 0; i < params.length; i++) {

package/lib/db/sql/createTable/createTableParser.js

@@ -205,7 +205,7 @@ export class CreateTableParser {
             targetTable,
             targetColumn,
             columnName,
-            relation: isColumnUnique ? "OneOrZero" : "Many",
+            relation: isColumnUnique ? 'OneOrZero' : 'Many',
             relationName: sameTableRefs.length !== 0 ? targetTable + sameTableRefs.length : undefined,
             onUpdate,
             onDelete,

package/lib/db/sql/createTable/createTableSerializer.js

@@ -65,7 +65,7 @@ const startStrMap = [
                 targetTable,
                 targetColumn,
                 columnName,
-                relation: isColumnUnique ? "OneOrZero" : "Many",
+                relation: isColumnUnique ? 'OneOrZero' : 'Many',
                 relationName: sameTableRefs.length !== 0 ? targetTable + sameTableRefs.length : undefined,
                 onUpdate: onUpdate !== -1 ? tokens[onUpdate + 1].value : undefined,
                 onDelete: onDelete !== -1 ? tokens[onDelete + 1].value : undefined,

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

@@ -1,4 +1,4 @@
-import { config } from "../../../config/config.js";
+import { config } from '../../../config/config.js';
 export class ImportDeclaration {
     constructor(types, module) {
         this.types = types;

package/lib/generator/ts/staticFiles.js

@@ -1,4 +1,4 @@
-import { ImportDeclaration } from "./code/importDeclaration.js";
+import { ImportDeclaration } from './code/importDeclaration.js';
 const contextFile = `\
 ${new ImportDeclaration(['BaseGqlContext'], './__generated__/context').toString()}
 export interface GqlContext extends BaseGqlContext {}

package/lib/migration/front/tableMigrator.d.ts

@@ -6,7 +6,7 @@ import { GqlOption } from '../data/gqlOption.js';
 import { Column } from '../serializable/column.js';
 import { SerializedTable } from '../serialized/serializedStore.js';
 import { DBType } from '../column/columnTypes.js';
-import { DBIndex } from "../data/index.js";
+import { DBIndex } from '../data/index.js';
 export interface MigrationTable extends Table {
     addIndex(...columns: string[]): MigrationTable;
     removeIndex(...columns: string[]): MigrationTable;

package/lib/migration/front/tableMigrator.js

@@ -2,7 +2,7 @@ import { TableHandler } from '../serializable/table.js';
 import { NormalColumn } from '../serializable/column.js';
 import { SqlCreator } from '../../db/sql/sqlCreater.js';
 import { SqlString } from '../../runtime/sql/sqlString.js';
-import { DBIndex } from "../data/index.js";
+import { DBIndex } from '../data/index.js';
 export class TableMigrator {
     constructor(table, store) {
         this.table = table;

package/lib/migration/migrationReader.js

@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import ts from 'typescript';
 import { readInitialSchema } from '../util/fsUtil.js';
-import { config } from "../config/config.js";
+import { config } from '../config/config.js';
 export class MigrationReader {
     read(onMigrate) {
         const files = fs.readdirSync(MigrationTargetResolver.getMigrationDir());
@@ -21,11 +21,11 @@ export class MigrationReader {
         return store;
     }
     static getTsConfig() {
-        const configFileName = ts.findConfigFile("./", ts.sys.fileExists, "tsconfig.json");
+        const configFileName = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
         if (!configFileName)
             return undefined;
         const configFile = ts.readConfigFile(configFileName, ts.sys.readFile);
-        return ts.parseJsonConfigFileContent(configFile.config, ts.sys, "./").options;
+        return ts.parseJsonConfigFileContent(configFile.config, ts.sys, './').options;
     }
     static readMigration(store, fileName, direction) {
         const file = fs.readFileSync(path.join(MigrationTargetResolver.getMigrationDir(), fileName)).toString();

package/lib/migration/migrationTargetResolver.js

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { config } from '../config/config.js';
-import { getDbClient } from "../db/getDbClient.js";
+import { getDbClient } from '../db/getDbClient.js';
 export var Direction;
 (function (Direction) {
     Direction["Up"] = "up";

package/lib/migration/serialized/serializedColumn.d.ts

@@ -1,7 +1,7 @@
 import { DBColumnTypes } from '../column/columnTypes.js';
 import { SqlValueType } from '../../db/connectors/dbClient.js';
 import { ForeignKeyReferentialAction } from '../data/foreignKey.js';
-import { Relation } from "../data/relation.js";
+import { Relation } from '../data/relation.js';
 interface SerializedColumnBase {
     hasReference: boolean;
     fieldName: string;

package/lib/parser/node/relationNode.d.ts

@@ -2,7 +2,7 @@ import { TypeNode } from './typeNode.js';
 import { EntityNode } from './entityNode.js';
 import { ReferenceColumn } from '../../migration/serializable/column.js';
 import { EntityName } from './entityName.js';
-import { Relation } from "../../migration/data/relation.js";
+import { Relation } from '../../migration/data/relation.js';
 export declare class RelationNode {
     readonly parent: EntityNode;
     readonly relationName: string | undefined;

package/lib/parser/node/repositoryNode.js

@@ -36,7 +36,7 @@ export class RepositoryNode {
         const refMethods = (relation) => {
             return new FindMethodNode([
                 new ParameterNode(relation.fromField, new TypeNode(relation.parent.field(relation.fromField).dbType, false, false)),
-            ], new TypeNode(EntityName.fromTableName(relation.parent.repository.tableName), relation.relation === "Many", false), false);
+            ], new TypeNode(EntityName.fromTableName(relation.parent.repository.tableName), relation.relation === 'Many', false), false);
         };
         const referencedByMethod = (relation) => {
             const to = relation.parent.repository.root.findRepository(relation.toEntityName);

package/lib/runtime/dsl/mutation/mutation.d.ts

@@ -1,6 +1,6 @@
 import { SqlValueType } from '../../../db/connectors/dbClient.js';
 import { TableInfo } from '../query/createQueryResolveInfo.js';
-import { BooleanValueExpression } from "../query/query.js";
+import { BooleanValueExpression } from '../query/query.js';
 declare type ValueSet = {
     field: string;
     value: SqlValueType;

package/lib/runtime/dsl/query/createQueryResolveInfo.d.ts

@@ -1,6 +1,6 @@
 import { BooleanValueExpression } from './query.js';
 import { QueryResolveInfo } from './sql/hydrate.js';
-import { Fields } from "../../field.js";
+import { Fields } from '../../field.js';
 export declare type RelationInfo = {
     table: string;
     on: (parentTableAlias: string, childTableAlias: string) => BooleanValueExpression;

package/lib/runtime/dsl/query/fieldToQuery.d.ts

@@ -1,4 +1,4 @@
 import { Query } from './query.js';
 import { RelationMap } from './createQueryResolveInfo.js';
-import { Fields } from "../../field.js";
+import { Fields } from '../../field.js';
 export declare const fieldToQuery: (tableName: string, fields: Fields, map: RelationMap) => Query;

package/lib/runtime/dsl/query/query.d.ts

@@ -1,4 +1,4 @@
-import { ComparisonOperators } from "../../../db/sql/expression/comparison.js";
+import { ComparisonOperators } from '../../../db/sql/expression/comparison.js';
 export declare enum QueryNodeKind {
     Field = 0,
     Function = 1,

package/lib/runtime/dsl/replaceAliases.js

@@ -56,7 +56,7 @@ export const replaceAliases = (query, tableInfo) => {
     addAlias(query.from);
     const replaceAlias = createAliasReplacer(tableInfo, tableAliases);
     return {
-        select: query.select.map(replaceAlias),
+        select: query.select.map(replaceAlias).filter(it => it.kind !== QueryNodeKind.Field || it.name),
         from: replaceAlias(query.from),
         where: query.where ? replaceAlias(query.where) : undefined,
         sort: query.sort ? query.sort.map(replaceAlias) : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.14.8",
+  "version": "0.14.9",
   "repository": "https://github.com/yanokunpei/sasat.git",
   "author": "yanokunpei <ninian138@gmail.com>",
   "license": "MIT",