@ldsg/cli 0.3.27 → 0.3.28

package/dist/utils/get-extend-app-data-params-using-npm-ldsg-module.js

@@ -11,19 +11,18 @@ const getExtendAppDataParamsUsingNpmLdsgModule = async (params) => {
     const packageJsonFile = constants_1.FILES_IN_APP_TEMPLATE_MODULE.find((file) => file.path === 'package.json');
     lodash_1.default.set(packageJsonFile, 'data.dependencies["@ldsg/create-app"]', 'latest');
     lodash_1.default.set(packageJsonFile, 'data.dependencies["@ldsg/opentelemetry-node"]', 'latest');
+    lodash_1.default.set(packageJsonFile, 'data.overrides', {
+        graphql: '$graphql',
+        'graphql-middleware': '$graphql-middleware',
+        'graphql-shield': '$graphql-shield'
+    });
+    lodash_1.default.set(packageJsonFile, 'data.workspaces', ['handlers/*']);
+    lodash_1.default.set(packageJsonFile, 'data.scripts.build', 'npm run build --workspaces && tsc --project tsconfig.json');
     let res = {
         appData,
         extraAppData: {
             reuseMainAppDependencies: ['graphql', 'graphql-middleware', 'graphql-shield'],
-            filesInAppModele: [
-                ...constants_1.FILES_IN_APP_TEMPLATE_MODULE,
-                packageJsonFile,
-                {
-                    path: 'pnpm-workspace.yaml',
-                    data: `packages:
-  - 'handlers/*'`
-                }
-            ]
+            filesInAppModele: [...constants_1.FILES_IN_APP_TEMPLATE_MODULE, packageJsonFile]
         }
     };
     return res;

package/dist/utils/get-extend-app-data-params-using-npm-ldsg-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-extend-app-data-params-using-npm-ldsg-module.js","sourceRoot":"","sources":["../../src/utils/get-extend-app-data-params-using-npm-ldsg-module.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA+D;AAE/D,oDAAuB;AAGhB,MAAM,wCAAwC,GAA2B,KAAK,EAAE,MAAM,EAAE,EAAE;IAC/F,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE3B,MAAM,eAAe,GAAG,wCAA4B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IAKlG,gBAAC,CAAC,GAAG,CAAC,eAAe,EAAE,uCAAuC,EAAE,QAAQ,CAAC,CAAC;IAC1E,gBAAC,CAAC,GAAG,CAAC,eAAe,EAAE,+CAA+C,EAAE,QAAQ,CAAC,CAAC;IAElF,IAAI,GAAG,GAAwB;QAC7B,OAAO;QACP,YAAY,EAAE;YACZ,wBAAwB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,gBAAgB,CAAC;YAC7E,gBAAgB,EAAE;gBAChB,GAAG,wCAA4B;gBAC/B,eAAe;gBACf;oBACE,IAAI,EAAE,qBAAqB;oBAC3B,IAAI,EAAE;iBACC;iBACR;aACF;SACF;KACF,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA5BW,QAAA,wCAAwC,4CA4BnD"}
+{"version":3,"file":"get-extend-app-data-params-using-npm-ldsg-module.js","sourceRoot":"","sources":["../../src/utils/get-extend-app-data-params-using-npm-ldsg-module.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA+D;AAE/D,oDAAuB;AAGhB,MAAM,wCAAwC,GAA2B,KAAK,EAAE,MAAM,EAAE,EAAE;IAC/F,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE3B,MAAM,eAAe,GAAG,wCAA4B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IAKlG,gBAAC,CAAC,GAAG,CAAC,eAAe,EAAE,uCAAuC,EAAE,QAAQ,CAAC,CAAC;IAC1E,gBAAC,CAAC,GAAG,CAAC,eAAe,EAAE,+CAA+C,EAAE,QAAQ,CAAC,CAAC;IAClF,gBAAC,CAAC,GAAG,CAAC,eAAe,EAAE,gBAAgB,EAAE;QACvC,OAAO,EAAE,UAAU;QACnB,oBAAoB,EAAE,qBAAqB;QAC3C,gBAAgB,EAAE,iBAAiB;KACpC,CAAC,CAAC;IACH,gBAAC,CAAC,GAAG,CAAC,eAAe,EAAE,iBAAiB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAC1D,gBAAC,CAAC,GAAG,CAAC,eAAe,EAAE,oBAAoB,EAAE,2DAA2D,CAAC,CAAC;IAE1G,IAAI,GAAG,GAAwB;QAC7B,OAAO;QACP,YAAY,EAAE;YACZ,wBAAwB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,gBAAgB,CAAC;YAC7E,gBAAgB,EAAE,CAAC,GAAG,wCAA4B,EAAE,eAAe,CAAC;SACrE;KACF,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA3BW,QAAA,wCAAwC,4CA2BnD"}

package/dist/utils/get-extend-app-data-params-using-workspace-ldsg-module/index.js

@@ -5,9 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtendAppDataParamsUsingWorkspaceLdsgModule = void 0;
 const constants_1 = require("@ldsg/constants");
-const fs_extra_1 = __importDefault(require("fs-extra"));
+const utils_1 = require("@ldsg/utils");
 const lodash_1 = __importDefault(require("lodash"));
-const constants_2 = require("./constants");
 const DEBUG_APP_PACKAGE_NAME = '@ldsg/app';
 const getExtendAppDataParamsUsingWorkspaceLdsgModule = async (params) => {
     const { appData: paramsAppData } = params;
@@ -67,12 +66,7 @@ const getExtendAppDataParamsUsingWorkspaceLdsgModule = async (params) => {
             };
             return res;
         });
-        const rushJson = await fs_extra_1.default.readJson(constants_2.RUSH_JSON_PATH);
-        const newRushJson = {
-            ...rushJson,
-            projects: lodash_1.default.sortBy(lodash_1.default.uniqBy(rushJson.projects.concat(debugProjects), 'projectFolder'), 'projectFolder')
-        };
-        await fs_extra_1.default.writeJson(constants_2.RUSH_JSON_PATH, newRushJson, { spaces: 2 });
+        (0, utils_1.syncRushProjects)(utils_1.RUSH_JSON_PATH, debugProjects);
     }
     const packageJsonFile = constants_1.FILES_IN_APP_TEMPLATE_MODULE.find((file) => file.path === 'package.json');
     lodash_1.default.set(packageJsonFile, 'data.name', DEBUG_APP_PACKAGE_NAME);

package/dist/utils/get-extend-app-data-params-using-workspace-ldsg-module/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/get-extend-app-data-params-using-workspace-ldsg-module/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/get-extend-app-data-params-using-workspace-ldsg-module/index.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA+D;AAC/D,uCAAoF;AAEpF,oDAAuB;AAGvB,MAAM,sBAAsB,GAAG,WAAW,CAAC;AAepC,MAAM,8CAA8C,GAA2B,KAAK,EAAE,MAAM,EAAE,EAAE;IACrG,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAE1C,IAAI,OAAO,GAAG,aAAa,CAAC;IAO5B,CAAC;QACC,MAAM,EAAE,eAAe,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;QAE5D,MAAM,gBAAgB,GAGhB;YACJ;gBACE,WAAW,EAAE,sBAAsB;gBACnC,aAAa,EAAE,eAAe;aAC/B;SACF,CAAC;QAKF,MAAM,eAAe,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;YACpE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;YAEpC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,gBAAgB,CAAC,IAAI,CAAC;oBACpB,WAAW,EAAE,GAAG,EAAE,EAAE;oBACpB,aAAa,EAAE,aAAa,EAAE,EAAE;iBACjC,CAAC,CAAC;gBAEH,IAAI,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;oBACzE,MAAM,GAAG,GAAG,UAAU,CAAC;oBAEvB,IAAI,gBAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;wBAC5C,OAAO;4BACL,GAAG,UAAU;4BACb,OAAO,EAAE,aAAa;yBACvB,CAAC;oBACJ,CAAC;oBAED,OAAO,GAAG,CAAC;gBACb,CAAC,CAAC,CAAC;gBAEH,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;oBACjC;wBACE,IAAI,EAAE,aAAa;wBACnB,OAAO,EAAE,SAAS;qBACnB;oBACD;wBACE,IAAI,EAAE,YAAY;wBAClB,OAAO,EAAE,QAAQ;qBAClB;iBACF,CAAC,CAAC;gBAEH,OAAO;oBACL,GAAG,cAAc;oBACjB,QAAQ,EAAE;wBACR,GAAG,cAAc,CAAC,QAAQ;wBAC1B,YAAY;qBACb;iBACF,CAAC;YACJ,CAAC;YAED,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG;YACR,GAAG,OAAO;YACV,eAAe;SAChB,CAAC;QAEF,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClD,MAAM,GAAG,GAAG;gBACV,GAAG,IAAI;aACR,CAAC;YAEF,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,IAAA,wBAAgB,EAAC,sBAAc,EAAE,aAAa,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,eAAe,GAAG,wCAA4B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IAElG,gBAAC,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,EAAE,sBAAsB,CAAC,CAAC;IAE5D,MAAM,GAAG,GAAwB;QAC/B,OAAO;QACP,YAAY,EAAE;YACZ,gBAAgB,EAAE,CAAC,GAAG,wCAA4B,EAAE,eAAe,CAAC;SACrE;KACF,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAnGW,QAAA,8CAA8C,kDAmGzD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldsg/cli",
-  "version": "0.3.27",
+  "version": "0.3.28",
   "description": "",
   "keywords": [],
   "license": "ISC",
@@ -14,9 +14,9 @@
     "commander": "^12.0.0",
     "fs-extra": "^11.3.0",
     "jsonata": "^2.0.6",
-    "@ldsg/utils": "0.3.27",
-    "@ldsg/apaas-to-runtime": "0.3.27",
-    "@ldsg/constants": "0.3.27"
+    "@ldsg/constants": "0.3.28",
+    "@ldsg/apaas-to-runtime": "0.3.28",
+    "@ldsg/utils": "0.3.28"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
@@ -32,7 +32,7 @@
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.3.3",
-    "@ldsg/types": "0.3.27"
+    "@ldsg/types": "0.3.28"
   },
   "publishConfig": {
     "access": "public"

package/src/cli.ts

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+import { readFileSync } from 'fs';
+import { join } from 'path';
 import { convertApaasResourceRecordsToResourceRecords } from '@ldsg/apaas-to-runtime';
 import { AppData } from '@ldsg/types';
 import {
@@ -13,9 +15,11 @@ import { DEFAULT_OUTPUT_PATH } from './constants';
 import { getExtendAppDataParamsUsingNpmLdsgModule } from './utils/get-extend-app-data-params-using-npm-ldsg-module';
 import { getExtendAppDataParamsUsingWorkspaceLdsgModule } from './utils/get-extend-app-data-params-using-workspace-ldsg-module';
 
+const { version } = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf-8'));
+
 const program = new Command();
 
-program.name('ldsg').description('LDSG CLI tools');
+program.name('ldsg').description('LDSG CLI tools').version(version);
 
 program
   .command('generate')

package/src/utils/get-extend-app-data-params-using-npm-ldsg-module.ts

@@ -13,20 +13,19 @@ export const getExtendAppDataParamsUsingNpmLdsgModule: GetExtendAppDataParams =
    */
   _.set(packageJsonFile, 'data.dependencies["@ldsg/create-app"]', 'latest');
   _.set(packageJsonFile, 'data.dependencies["@ldsg/opentelemetry-node"]', 'latest');
+  _.set(packageJsonFile, 'data.overrides', {
+    graphql: '$graphql',
+    'graphql-middleware': '$graphql-middleware',
+    'graphql-shield': '$graphql-shield'
+  });
+  _.set(packageJsonFile, 'data.workspaces', ['handlers/*']);
+  _.set(packageJsonFile, 'data.scripts.build', 'npm run build --workspaces && tsc --project tsconfig.json');
 
   let res: ExtendAppDataParams = {
     appData,
     extraAppData: {
       reuseMainAppDependencies: ['graphql', 'graphql-middleware', 'graphql-shield'],
-      filesInAppModele: [
-        ...FILES_IN_APP_TEMPLATE_MODULE,
-        packageJsonFile,
-        {
-          path: 'pnpm-workspace.yaml',
-          data: `packages:
-  - 'handlers/*'`
-        }
-      ]
+      filesInAppModele: [...FILES_IN_APP_TEMPLATE_MODULE, packageJsonFile]
     }
   };
 

package/src/utils/get-extend-app-data-params-using-workspace-ldsg-module/index.ts

@@ -1,9 +1,8 @@
 import { FILES_IN_APP_TEMPLATE_MODULE } from '@ldsg/constants';
-import { ExtendAppDataParams } from '@ldsg/utils';
+import { ExtendAppDataParams, RUSH_JSON_PATH, syncRushProjects } from '@ldsg/utils';
 import fs from 'fs-extra';
 import _ from 'lodash';
 import { GetExtendAppDataParams } from '../../types/get-extend-app-data-params';
-import { RUSH_JSON_PATH } from './constants';
 
 const DEBUG_APP_PACKAGE_NAME = '@ldsg/app';
 
@@ -104,14 +103,7 @@ export const getExtendAppDataParamsUsingWorkspaceLdsgModule: GetExtendAppDataPar
       return res;
     });
 
-    const rushJson = await fs.readJson(RUSH_JSON_PATH);
-
-    const newRushJson = {
-      ...rushJson,
-      projects: _.sortBy(_.uniqBy(rushJson.projects.concat(debugProjects), 'projectFolder'), 'projectFolder')
-    };
-
-    await fs.writeJson(RUSH_JSON_PATH, newRushJson, { spaces: 2 });
+    syncRushProjects(RUSH_JSON_PATH, debugProjects);
   }
 
   const packageJsonFile = FILES_IN_APP_TEMPLATE_MODULE.find((file) => file.path === 'package.json');
@@ -121,7 +113,6 @@ export const getExtendAppDataParamsUsingWorkspaceLdsgModule: GetExtendAppDataPar
   const res: ExtendAppDataParams = {
     appData,
     extraAppData: {
-      // reuseMainAppDependencies: ['graphql', 'graphql-middleware', 'graphql-shield'],
       filesInAppModele: [...FILES_IN_APP_TEMPLATE_MODULE, packageJsonFile]
     }
   };