@common-stack/generate-plugin 5.0.6-alpha.3 → 5.0.6-alpha.4

package/src/generators/add-client-package/schema.d.ts

@@ -0,0 +1,4 @@
+export interface AddClientPackageGeneratorSchema {
+    name: string;
+    directory: string;
+}

package/src/generators/add-client-package/schema.json

@@ -0,0 +1,19 @@
+{
+    "$schema": "https://json-schema.org/schema",
+    "$id": "AddClientPackage",
+    "title": "",
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string",
+            "description": "",
+            "x-prompt": "What name would you like to use?"
+        },
+        "directory": {
+            "type": "string",
+            "description": "",
+            "x-prompt": "What directory would you like to create in?"
+        }
+    },
+    "required": ["name", "directory"]
+}

package/src/generators/add-core-package/generator.spec.ts

@@ -0,0 +1,20 @@
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import { Tree, readProjectConfiguration } from '@nx/devkit';
+
+import { addCorePackageGenerator } from './generator';
+import { AddCorePackageGeneratorSchema } from './schema';
+
+describe('add-core-package generator', () => {
+    let tree: Tree;
+    const options: AddCorePackageGeneratorSchema = { name: 'test', directory: 'lib' };
+
+    beforeEach(() => {
+        tree = createTreeWithEmptyWorkspace();
+    });
+
+    it('should run successfully', async () => {
+        await addCorePackageGenerator(tree, options);
+        const config = readProjectConfiguration(tree, 'test');
+        expect(config).toBeDefined();
+    });
+});

package/src/generators/add-core-package/generator.ts

@@ -0,0 +1,23 @@
+import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
+import * as path from 'path';
+import { AddCorePackageGeneratorSchema } from './schema';
+import { isValid, getValid } from '../../utils';
+
+export async function addCorePackageGenerator(tree: Tree, options: AddCorePackageGeneratorSchema) {
+    const projectName = getValid(options.name) ?? 'core-package';
+    const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    // addProjectConfiguration(tree, options.name, {
+    //     root: projectRoot,
+    //     projectType: 'library',
+    //     sourceRoot: `${projectRoot}/src`,
+    //     targets: {},
+    // });
+    generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
+    updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson['name'] = projectName;
+        return packageJson;
+    });
+    await formatFiles(tree);
+}
+
+export default addCorePackageGenerator;

package/src/generators/add-core-package/schema.d.ts

@@ -0,0 +1,4 @@
+export interface AddCorePackageGeneratorSchema {
+    name: string;
+    directory: string;
+}

package/src/generators/add-core-package/schema.json

@@ -0,0 +1,19 @@
+{
+    "$schema": "https://json-schema.org/schema",
+    "$id": "AddCorePackage",
+    "title": "",
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string",
+            "description": "",
+            "x-prompt": "What name would you like to use?"
+        },
+        "directory": {
+            "type": "string",
+            "description": "",
+            "x-prompt": "What directory would you like to create in?"
+        }
+    },
+    "required": ["name", "directory"]
+}

package/src/generators/add-fullstack/files/package.json

@@ -159,7 +159,7 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "5.0.6-alpha.1",
+        "@common-stack/env-list-loader": "5.0.6-alpha.3",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",

package/src/generators/add-moleculer/files/package.json

@@ -28,11 +28,11 @@
         "@casl/ability": "^4.1.5",
         "@cdm-logger/client": "9.0.3",
         "@cdm-logger/server": "^9.0.3",
-        "@common-stack/client-core": "5.0.6-alpha.1",
-        "@common-stack/core": "5.0.6-alpha.1",
-        "@common-stack/server-core": "5.0.6-alpha.1",
-        "@common-stack/server-stack": "5.0.6-alpha.1",
-        "@common-stack/store-mongo": "5.0.6-alpha.1",
+        "@common-stack/client-core": "5.0.6-alpha.3",
+        "@common-stack/core": "5.0.6-alpha.3",
+        "@common-stack/server-core": "5.0.6-alpha.3",
+        "@common-stack/server-stack": "5.0.6-alpha.3",
+        "@common-stack/store-mongo": "5.0.6-alpha.3",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "app-root-path": "^3.0.0",
         "body-parser": "^1.19.0",

package/src/generators/add-server-package/generator.spec.ts

@@ -0,0 +1,20 @@
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import { Tree, readProjectConfiguration } from '@nx/devkit';
+
+import { addServerPackageGenerator } from './generator';
+import { AddServerPackageGeneratorSchema } from './schema';
+
+describe('add-server-package generator', () => {
+    let tree: Tree;
+    const options: AddServerPackageGeneratorSchema = { name: 'test', directory: 'lib' };
+
+    beforeEach(() => {
+        tree = createTreeWithEmptyWorkspace();
+    });
+
+    it('should run successfully', async () => {
+        await addServerPackageGenerator(tree, options);
+        const config = readProjectConfiguration(tree, 'test');
+        expect(config).toBeDefined();
+    });
+});

package/src/generators/add-server-package/generator.ts

@@ -0,0 +1,23 @@
+import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
+import * as path from 'path';
+import { AddServerPackageGeneratorSchema } from './schema';
+import { isValid, getValid } from '../../utils';
+
+export async function addServerPackageGenerator(tree: Tree, options: AddServerPackageGeneratorSchema) {
+    const projectName = getValid(options.name) ?? 'server-package';
+    const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    // addProjectConfiguration(tree, options.name, {
+    //     root: projectRoot,
+    //     projectType: 'library',
+    //     sourceRoot: `${projectRoot}/src`,
+    //     targets: {},
+    // });
+    generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
+    updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson['name'] = projectName;
+        return packageJson;
+    });
+    await formatFiles(tree);
+}
+
+export default addServerPackageGenerator;

package/src/generators/add-server-package/schema.d.ts

@@ -0,0 +1,4 @@
+export interface AddServerPackageGeneratorSchema {
+    name: string;
+    directory: string;
+}

package/src/generators/add-server-package/schema.json

@@ -0,0 +1,19 @@
+{
+    "$schema": "https://json-schema.org/schema",
+    "$id": "AddServerPackage",
+    "title": "",
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string",
+            "description": "",
+            "x-prompt": "What name would you like to use?"
+        },
+        "directory": {
+            "type": "string",
+            "description": "",
+            "x-prompt": "What directory would you like to create in?"
+        }
+    },
+    "required": ["name", "directory"]
+}

package/src/index.ts

@@ -3,3 +3,8 @@ export * from './generators/add-backend/generator';
 export * from './generators/add-fullstack/generator';
 export * from './generators/add-moleculer/generator';
 export * from './generators/add-browser-package/generator';
+export * from './generators/add-client-package/generator';
+export * from './generators/add-core-package/generator';
+export * from './generators/add-server-package/generator';
+export { default as updateDeployVersion } from './executors/update-deploy-version/executor';
+export { default as sortPackageJson } from './executors/sort-package-json/executor';

package/lib/generators/add-backend/files/knexfile.js

@@ -1,63 +0,0 @@
-// Update with your config settings.
-var path = require('path');
-require('dotenv').config({ path: process.env.ENV_FILE });
-
-var connection = {
-  host: process.env.DB_HOST,
-  user: process.env.DB_USER,
-  socketPath: process.env.DB_SOCKET_PATH,
-  password: process.env.DB_PASSWORD,
-  database: process.env.DB_DATABASE,
-  multipleStatements: true,
-  charset: 'utf8',
-};
-var DB_CLIENT = process.env.DB_TYPE || 'sqlite3';
-
-var migrations_path = path.dirname(require.resolve('@adminide-stack/store/lib/store/migrations/index'));
-var seeds_path = path.dirname(require.resolve('@adminide-stack/store/lib/store/seeds/index'));
-module.exports = {
-
-  development: {
-    client: 'sqlite3',
-    connection: {
-      filename: './dev-db.sqlite3'
-    },
-    seeds: {
-      directory: seeds_path,
-    },
-    migrations: {
-      directory: migrations_path,
-    },
-    useNullAsDefault: true,
-  },
-
-  test: {
-    client: DB_CLIENT,
-    connection: connection,
-    pool: {
-      min: 2,
-      max: 10
-    },
-    seeds: {
-      directory: seeds_path,
-    },
-    migrations: {
-      directory: migrations_path,
-    },
-    useNullAsDefault: true,
-  },
-
-  production: {
-    client: DB_CLIENT,
-    connection: connection,
-    pool: {
-      min: 2,
-      max: 200
-    },
-    migrations: {
-      directory: migrations_path,
-    },
-    useNullAsDefault: true,
-  }
-
-};

package/lib/generators/add-backend/files/src/api/remote-config.ts.template

@@ -1,11 +0,0 @@
-interface ISchemaConfig {
-    uri: string;
-    wsUri: string;
-}
-
-export const remoteSchemaDetails: ISchemaConfig[] = [
-    // {
-    // uri: 'http://localhost:8085/graphql',
-    // wsUri: 'ws://localhost:8085/graphql',
-    // },
-];

package/lib/generators/add-backend/files/src/api/resolver.ts.template

@@ -1,15 +0,0 @@
-import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
-import { GraphQLDate, GraphQLTime, GraphQLDateTime } from 'graphql-iso-date';
-import { GraphQLAnyObject } from './scalar';
-import GraphQLURI from '@cdmbase/graphql-type-uri';
-
-export const resolvers = {
-    AnyObject: GraphQLAnyObject,
-    Date: GraphQLDate,
-    Time: GraphQLTime,
-    URI: GraphQLURI('URI'),
-    URIInput: GraphQLURI('URIInput'),
-    DateTime: GraphQLDateTime,
-    JSON: GraphQLJSON,
-    JSONObject: GraphQLJSONObject,
-};

package/lib/generators/add-backend/files/src/api/scalar.ts.template

@@ -1,16 +0,0 @@
-// add any scalar types
-import { GraphQLError, GraphQLScalarType, Kind } from 'graphql';
-
-// https://stackoverflow.com/questions/41557536/custom-map-keys-in-graphql-response
-export const GraphQLAnyObject = new GraphQLScalarType({
-    name: 'AnyObject',
-    description: 'Any JSON object. This type bypasses type checking.',
-    serialize: (value) => value,
-    parseValue: (value) => value,
-    parseLiteral: (ast) => {
-        if (ast.kind !== Kind.OBJECT) {
-            throw new GraphQLError(`Query error: Can only parse object but got a: ${ast.kind}`, [ast]);
-        }
-        return ast.fields;
-    },
-});

package/lib/generators/add-backend/files/src/api/schema-builder.ts.template

@@ -1,189 +0,0 @@
-/* eslint-disable class-methods-use-this */
-/* eslint-disable no-useless-constructor */
-/* eslint-disable import/no-extraneous-dependencies */
-import * as fs from 'fs';
-import { GraphQLSchema, OperationDefinitionNode } from 'graphql';
-import { stitchSchemas } from '@graphql-tools/stitch';
-import { makeExecutableSchema } from '@graphql-tools/schema';
-import { linkToExecutor } from '@graphql-tools/links';
-import { introspectSchema, wrapSchema } from '@graphql-tools/wrap';
-// import { transformSchema } from '@graphql-tools/delegate';
-import * as ws from 'ws';
-import { getMainDefinition } from '@apollo/client/utilities';
-import { WebSocketLink } from '@apollo/client/link/ws';
-import { split } from '@apollo/client/index.js';
-import { IGraphqlShieldRules, logger } from '@common-stack/server-core';
-import { HttpLink } from '@apollo/client/link/http';
-import * as fetch from 'isomorphic-fetch';
-import { CdmLogger } from '@cdm-logger/core';
-import { shield } from 'graphql-shield';
-import { applyMiddleware } from 'graphql-middleware';
-import { remoteSchemaDetails } from './remote-config';
-import rootSchemaDef from './root-schema.graphqls';
-import { resolvers as rootResolver } from './resolver';
-import { attachDirectiveResolvers } from './utils';
-
-interface IGraphqlOptions {
-    schema: string | string[];
-    resolvers: any;
-    directives: any[];
-    directiveResolvers: { [key: string]: any };
-    middlewares: any[];
-    rules?: IGraphqlShieldRules;
-    logger: CdmLogger.ILogger;
-}
-export class GatewaySchemaBuilder {
-    constructor(private options: IGraphqlOptions) {}
-
-    public async build(): Promise<GraphQLSchema> {
-        let gatewaySchema;
-        let ownSchema;
-        try {
-            ownSchema = this.createOwnSchema();
-            const remoteSchema = await this.load();
-            // techSchema = this.patchSchema(techSchema, 'TechService');
-
-            gatewaySchema = stitchSchemas({
-                subschemas: [ownSchema],
-            });
-
-            // Apply middleware to the schema
-            if (this.options.middlewares && this.options.middlewares.length > 0) {
-                gatewaySchema = applyMiddleware(
-                    gatewaySchema,
-                    ...this.options.middlewares,
-                    shield(this.options.rules || {}, {
-                        allowExternalErrors: true,
-                    }),
-                );
-            }
-            // TODO after updating graphql-tools to v8
-            // addErrorLoggingToSchema(schema, { log: (e) => logger.error(e as Error) });
-        } catch (err) {
-            logger.error('[Graphql Schema Errors] when building schema:', err.message);
-            gatewaySchema = ownSchema;
-        }
-
-        return gatewaySchema;
-    }
-
-    private async load() {
-        const schemas = [];
-        // eslint-disable-next-line no-plusplus
-        for (let i = 0; i < remoteSchemaDetails.length; i++) {
-            // eslint-disable-next-line no-await-in-loop
-            const schema = await this.loadRemoteSchema(remoteSchemaDetails[i]);
-            schemas.push(schema);
-        }
-        return schemas;
-    }
-
-    private async createRemoteSchema(service: string, iteration?: number): Promise<GraphQLSchema> {
-        logger.info('Fetch service [%s] iteration [%s]', service, iteration);
-        const services = remoteSchemaDetails;
-        if (!services.length) {
-            console.warn(`Service ${services} is undefined`);
-            if (iteration && iteration > 2) {
-                return Promise.reject(`tried upto ${iteration} attempts, now failing...`);
-            }
-            return new Promise<GraphQLSchema>((resolve, reject) => {
-                const timeout = iteration ? 1000 * iteration : 1000;
-                logger.info('Wait for service startup %s', timeout);
-                setTimeout(() => {
-                    this.createRemoteSchema(service, iteration ? iteration + 1 : 1)
-                        .then(resolve)
-                        .catch(reject);
-                }, timeout);
-            });
-        }
-        // instead need to loop it
-        // https://github.com/j-colter/graphql-gateway/blob/9c64d90a74727d2002d10b06f47e1f4a316070fc/src/schema.js#L50
-        const url = services[0].uri;
-        logger.info('fetch service [%s]', url);
-        // 1. Create apollo Link that's connected to the underlying GraphQL API
-        const link = new HttpLink({ uri: url, fetch });
-        const executor: any = linkToExecutor(link);
-        // 2. Retrieve schema definition of the underlying GraphQL API
-        const remoteSchema = await introspectSchema(link as any);
-
-        // 3. Create the executable schema based on schema definition and Apollo Link
-        return wrapSchema({
-            schema: remoteSchema,
-            executor,
-        });
-    }
-
-    private async loadRemoteSchema({ uri, wsUri }) {
-        try {
-            const httpLink = new HttpLink({ uri, fetch });
-            let link = null;
-
-            if (wsUri) {
-                const wsLink = new WebSocketLink({
-                    uri: wsUri,
-                    options: {
-                        reconnect: true,
-                    },
-                    webSocketImpl: ws,
-                });
-                link = split(
-                    // split based on operatino type
-                    ({ query }) => {
-                        const { kind, operation } = getMainDefinition(query) as OperationDefinitionNode;
-                        return kind === 'OperationDefinition' && operation === 'subscription';
-                    },
-                    wsLink,
-                    httpLink,
-                );
-            } else {
-                link = httpLink;
-            }
-            const executor: any = linkToExecutor(link);
-            const remoteSchema = await introspectSchema(link);
-            const executableSchema = wrapSchema({
-                schema: remoteSchema,
-                executor,
-            });
-            return executableSchema;
-        } catch (err) {
-            this.options.logger.error('fetching schema error: ', err);
-            return {};
-        }
-    }
-
-    // disabled after updating to apollo-client to v3 and graphql-tools to v8
-    // private patchSchema(schema: GraphQLSchema, systemName: string) {
-    //     return transformSchema(schema, [
-    //         new RenameTypes((name: string) => (name === 'StatusInfo' ? `${systemName}StatusInfo` : undefined)),
-    //         new RenameRootFields((_operation: string, name: string) =>
-    //             name === 'status'
-    //                 ? `${systemName.substring(0, 1).toLowerCase()}${systemName.substring(1)}Status`
-    //                 : name,
-    //         ),
-    //     ]);
-    // }
-
-    private createOwnSchema(): GraphQLSchema {
-        const typeDefs = [rootSchemaDef, this.options.schema].join('\n');
-        if (__DEV__) {
-            import('../modules/module').then(({ ExternalModules }) => {
-                const externalSchema = ExternalModules?.schemas || ``;
-                const writeData = `${externalSchema}`;
-                fs.writeFileSync('./generated-schema.graphql', writeData);
-            });
-        }
-        let mergedSchema = makeExecutableSchema({
-            resolvers: [rootResolver, this.options.resolvers],
-            typeDefs,
-            resolverValidationOptions: {
-                requireResolversForResolveType: 'warn',
-            },
-        });
-        // mergedSchema = this.options.directives.reduce((curSchema,transform) => transform(curSchema), mergedSchema);
-        if (this.options.directiveResolvers && Object.keys(this.options.directiveResolvers).length !== 0) {
-            this.options.logger.warn('directiveResolvers deprecated replaced with directives');
-            mergedSchema = attachDirectiveResolvers(mergedSchema, this.options.directiveResolvers);
-        }
-        return mergedSchema;
-    }
-}

package/lib/generators/add-backend/files/src/api/utils.ts.template

@@ -1,44 +0,0 @@
-import { defaultFieldResolver, GraphQLSchema } from 'graphql';
-import { mapSchema, MapperKind, getDirectives } from '@graphql-tools/utils';
-
-export function attachDirectiveResolvers(
-    schema: GraphQLSchema,
-    directiveResolvers: {[key: string]: Function},
-): GraphQLSchema {
-    // ... argument validation ...
-
-    return mapSchema(schema, {
-        [MapperKind.OBJECT_FIELD]: (fieldConfig) => {
-            const newFieldConfig = { ...fieldConfig };
-
-            const directives = getDirectives(schema, fieldConfig);
-            for (const directive of directives) {
-                const directiveName = directive.name;
-                if (directiveResolvers[directiveName]) {
-                    const resolver = directiveResolvers[directiveName];
-                    const originalResolver =
-                        newFieldConfig.resolve != null ? newFieldConfig.resolve : defaultFieldResolver;
-                    const directiveArgs = directive.args;
-                    newFieldConfig.resolve = (source, originalArgs, context, info) => {
-                        return resolver(
-                            () =>
-                                new Promise((resolve, reject) => {
-                                    const result = originalResolver(source, originalArgs, context, info);
-                                    if (result instanceof Error) {
-                                        reject(result);
-                                    }
-                                    resolve(result);
-                                }),
-                            source,
-                            directiveArgs,
-                            context,
-                            info,
-                        );
-                    };
-                }
-            }
-
-            return newFieldConfig;
-        },
-    });
-}