@common-stack/generate-plugin 6.0.1-alpha.9 → 6.0.2-alpha.10

package/src/generators/add-fullstack/updates/jenkinsfileUpdate.ts

@@ -0,0 +1,47 @@
+import fs from 'fs';
+import * as path from 'path';
+
+export function updateJenkinsFile(filePath: string, name: string) {
+    const paramsToUpdate = {
+        BASE_NAMESPACE: name,
+        CONNECTION_ID: name,
+        WORKSPACE_ID: name,
+        UNIQUE_NAME: name,
+    };
+
+    let jenkinsFileContent = '';
+    if (fs.existsSync(filePath)) {
+        jenkinsFileContent = fs.readFileSync(filePath, 'utf-8');
+    }
+
+    let labelExists = false;
+
+    const updatedContent = jenkinsFileContent.split('\n').map(line => {
+        // Check if the label is already defined and skip modifying it
+        if (line.includes('label') && line.includes('kubernetes')) {
+            labelExists = true;
+        }
+
+        // Update only the specified parameters
+        for (const param in paramsToUpdate) {
+            if (line.includes(`string(name: '${param}'`)) {
+                return line.replace(/defaultValue: '.*'/, `defaultValue: '${paramsToUpdate[param]}'`);
+            }
+        }
+        return line;
+    }).join('\n');
+
+    // Add missing parameters if they don't exist
+    Object.keys(paramsToUpdate).forEach(param => {
+        if (!updatedContent.includes(`string(name: '${param}'`)) {
+            updatedContent.concat(
+                `string(name: '${param}', defaultValue: '${paramsToUpdate[param]}', description: '${param.replace(/_/g, ' ').toLowerCase()}')\n`
+            );
+        }
+    });
+
+    // Only write back to the file if we have made changes
+    if (!labelExists || Object.keys(paramsToUpdate).some(param => !updatedContent.includes(`string(name: '${param}'`))) {
+        fs.writeFileSync(filePath, updatedContent, 'utf-8');
+    }
+}

package/src/generators/add-fullstack/updates/packageJsonUpdate.ts

@@ -0,0 +1,11 @@
+import { Tree, updateJson } from '@nx/devkit';
+import * as path from 'path';
+
+export function updatePackageJson(tree: Tree, projectRoot: string, name: string) {
+    const packageJsonPath = path.join(projectRoot, 'package.json');
+    updateJson(tree, packageJsonPath, (packageJson) => {
+        packageJson['name'] = name;
+        // You can add more custom logic here if needed
+        return packageJson;
+    });
+}

package/src/generators/add-moleculer/files/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.20-alpine
+FROM node:20:16-alpine
 
 # Copy package.json only to temp folder, install its dependencies,
 # set workdir and copy the dependnecies there

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

@@ -25,33 +25,14 @@
         "watch": "npm run start:dev"
     },
     "dependencies": {
-        "@casl/ability": "^4.1.5",
-        "@cdm-logger/client": "9.0.3",
-        "@cdm-logger/server": "^9.0.3",
-        "@common-stack/client-core": "6.0.1-alpha.0",
-        "@common-stack/core": "6.0.1-alpha.0",
-        "@common-stack/server-core": "6.0.1-alpha.6",
-        "@common-stack/server-stack": "6.0.1-alpha.8",
-        "@common-stack/store-mongo": "6.0.1-alpha.0",
+        "@common-stack/client-core": "6.0.2-alpha.2",
+        "@common-stack/core": "6.0.2-alpha.2",
+        "@common-stack/server-core": "6.0.2-alpha.2",
+        "@common-stack/server-stack": "6.0.2-alpha.2",
+        "@common-stack/store-mongo": "6.0.2-alpha.2",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
-        "app-root-path": "^3.0.0",
-        "body-parser": "^1.19.0",
-        "cors": "^2.8.5",
-        "dataloader": "^2.0.0",
-        "dotenv": "^7.0.0",
-        "envalid": "~7.2.2",
-        "esm": "^3.2.25",
         "helmet": "^3.21.2",
-        "inversify": "^6.0.2",
-        "ioredis": "^4.14.1",
-        "lodash": "^4.17.15",
-        "graphql-tools": "^9.0.0",
-        "moleculer": "^0.14.2",
-        "mongoose": "^6.3.3",
-        "mongoose-execution-time": "^1.1.0",
-        "react": "18.0.0",
-        "redux": "^4.0.1",
-        "reflect-metadata": "^0.1.13",
+        "react": "18.2.0",
         "rxjs": "^6.5.3",
         "rxjs-compat": "^6.5.3"
     },

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

@@ -4,19 +4,20 @@ import { AddMoleculerGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 
 export async function addMoleculerGenerator(tree: Tree, options: AddMoleculerGeneratorSchema) {
+    const configs: any = {...options};
+    return await generateMoleculer(tree, configs);
+}
+
+export const generateMoleculer = async (tree: Tree, options: any) => {
     const projectName = getValid(options.name) ?? 'moleculer-server';
     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'] = options.name;
         return packageJson;
     });
+
     await formatFiles(tree);
 }
 

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,24 @@
+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 configs: any = {...options};
+    return await generateServerPackage(tree, configs);
+}
+
+export const generateServerPackage = async (tree: Tree, options: any) => {
+    const projectName = getValid(options.name) ?? 'server-package';
+    const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+
+    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/generated-schema.graphql

@@ -1,235 +0,0 @@
-"""
-Address City Interface
-"""
-interface ICity {
-    id: ID!
-    name: String!
-    state: ITerritorialState!
-    location: GeoLocation
-    createdAt: DateTime!
-    updatedAt: DateTime!
-}
-
-"""
-Address City Create Input
-"""
-input CityInput {
-    """
-    Name of the state to display
-    """
-    name: String!
-    """
-    ID of State to associate
-    """
-    state: TerritorialStateInput!
-}
-
-"""
-Address City Update Input
-"""
-input CityUpdateInput {
-    name: String
-    state: TerritorialStateUpdateInput!
-}
-
-"""
-Pub N Go Property Address City
-"""
-type City implements ICity {
-    id: ID!
-    name: String!
-    state: State!
-    location: GeoLocation
-    createdAt: DateTime!
-    updatedAt: DateTime!
-}
-
-type Cities {
-    totalCount: Int!
-    data: [City]
-}
-
-input CitiesOptions {
-    criteria: AnyObject
-    limit: Int
-    skip: Int
-    sort: Sort
-}
-
-input CitiesInput {
-    countryOptions: CitiesOptions
-    stateOptions: CitiesOptions
-    cityOptions: CitiesOptions
-}
-
-extend type Query {
-    cities(input: CitiesInput): Cities!
-    city(id: ID!): City!
-}
-
-extend type Mutation {
-    createCity(propertyCity: CityInput!): City!
-    updateCity(id: ID!, propertyCity: CityUpdateInput!): City!
-    deleteCity(id: ID!): Boolean!
-}
-
-interface ICountry {
-    id: ID!
-    name: String!
-    phone_code: String!
-    currency: String
-    currency_symbol: String
-    emoji: String
-    location: GeoLocation
-    createdAt: DateTime!
-    updatedAt: DateTime!
-}
-
-type Country implements ICountry {
-    id: ID!
-    name: String!
-    phone_code: String!
-    currency: String
-    currency_symbol: String
-    emoji: String
-    location: GeoLocation
-    states(criteria: AnyObject, limit: Int, skip: Int, sort: Sort): States
-    createdAt: DateTime!
-    updatedAt: DateTime!
-}
-
-input CountryInput {
-    name: String!
-}
-
-type Countries {
-    totalCount: Int!
-    data: [Country]
-}
-
-extend type Query {
-    countries(criteria: AnyObject, limit: Int, skip: Int, sort: Sort): Countries!
-    country(id: ID!): Country!
-    countryByName(name: String!): Country!
-}
-
-extend type Mutation {
-    createCountry(country: CountryInput!): Country!
-    updateCountry(id: ID!, country: CountryInput!): Country!
-    deleteCountry(id: ID!): Boolean!
-}
-
-type Country implements ICountry{
-    id: ID!
-    name: String!
-    phone_code: String!
-    currency: String
-    currency_symbol: String
-    emoji: String
-    location: GeoLocation
-    states(criteria: AnyObject, limit: Int, skip: Int, sort: Sort): States
-    createdAt: DateTime!
-    updatedAt: DateTime!
-}
-
-type Countries {
-    totalCount: Int!
-    data: [Country]
-}
-
-extend type Query {
-    countries(criteria: AnyObject, limit: Int, skip: Int, sort: Sort): Countries!
-    country(id: ID!): Country!
-    countryByName(name: String!): Country!
-}
-
-extend type Mutation {
-    createCountry(country: CountryInput!): Country!
-    updateCountry(id: ID!, country: CountryInput!): Country!
-    deleteCountry(id: ID!): Boolean!
-}
-"""
-Territorial State
-"""
-interface ITerritorialState {
-    id: ID!
-    name: String!
-    country: ICountry!
-    location: GeoLocation
-    createdAt: DateTime!
-    updatedAt: DateTime!
-}
-
-"""
-Address State Create Input
-"""
-input TerritorialStateInput {
-    """
-    Name of the country to display
-    """
-    name: String!
-    """
-    ID of Country to associate
-    """
-    country: String!
-}
-
-"""
-Address State Update Input
-"""
-input TerritorialStateUpdateInput {
-    name: String
-    country: Int!
-}
-
-
-"""
-Address State
-"""
-type State implements ITerritorialState{
-    id: ID!
-    name: String!
-    country: Country!
-    cities(criteria: AnyObject, limit: Int, skip: Int, sort: Sort): Cities!
-    location: GeoLocation
-    createdAt: DateTime!
-    updatedAt: DateTime!
-}
-
-"""
-Address State Create Input
-"""
-input StateInput {
-    """
-    Name of the country to display
-    """
-    name: String!
-    """
-    ID of Country to associate
-    """
-    country: String!
-}
-
-"""
-Address State Update Input
-"""
-input StateUpdateInput {
-    name: String
-    country: String!
-}
-
-type States {
-    totalCount: Int!
-    data: [State]
-}
-
-extend type Query {
-    states(criteria: AnyObject, limit: Int, skip: Int, sort: Sort): States!
-    state(id: ID!): State!
-}
-
-extend type Mutation {
-    createState(state: StateInput!): State!
-    updateState(id: ID!, state: StateUpdateInput!): State!
-    deleteState(id: ID!): Boolean!
-}

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;
-    },
-});