contensis-cli 1.1.2-beta.9 → 1.2.0

package/dist/version.js

@@ -21,7 +21,7 @@ __export(version_exports, {
   LIB_VERSION: () => LIB_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const LIB_VERSION = "1.1.2-beta.9";
+const LIB_VERSION = "1.2.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LIB_VERSION

package/dist/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/version.ts"],
-  "sourcesContent": ["export const LIB_VERSION = \"1.1.2-beta.9\";\n"],
+  "sourcesContent": ["export const LIB_VERSION = \"1.2.0\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contensis-cli",
-  "version": "1.1.2-beta.9",
+  "version": "1.2.0",
   "description": "A fully featured Contensis command line interface with a shell UI provides simple and intuitive ways to manage or profile your content in any NodeJS terminal.",
   "repository": "https://github.com/contensis/cli",
   "homepage": "https://github.com/contensis/cli/tree/main/packages/contensis-cli#readme",
@@ -18,7 +18,8 @@
     "build:watch": "node esbuild.config.js --watch",
     "cli": "node --inspect=9229 ./cli.js",
     "postinstall": "npx patch-package",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "package-lock": "npm i --package-lock-only --workspaces false"
   },
   "author": "Zengenti",
   "license": "ISC",
@@ -39,7 +40,7 @@
     "jsonpath-mapper": "^1.1.0",
     "keytar": "^7.9.0",
     "lodash": "^4.17.21",
-    "migratortron": "^1.0.0-beta.46",
+    "migratortron": "^1.0.0-beta.48",
     "nanospinner": "^1.1.0",
     "node-fetch": "^2.6.7",
     "parse-git-config": "^3.0.0",

package/src/commands/copy.ts

@@ -4,9 +4,11 @@ import { cliCommand } from '~/services/ContensisCliService';
 import {
   commit,
   concurrency,
+  entryId,
   ignoreErrors,
   mapContensisOpts,
   outputEntries,
+  zenql,
 } from './globalOptions';
 
 export const makeCopyCommand = () => {
@@ -34,6 +36,16 @@ export const makeCopyCommand = () => {
     .addOption(concurrency)
     .addOption(ignoreErrors)
     .addOption(outputEntries)
+    .option(
+      '--search <phrase>',
+      'get entries with the search phrase, use quotes for multiple words'
+    )
+    .addOption(entryId)
+    .addOption(zenql)
+    .option(
+      '-s --save-entries',
+      "save the entries we're migrating instead of the migration preview when using --output option"
+    )
     .usage('<contentTypeId> <fieldId> <destinationId> (all arguments required)')
     .addHelpText(
       'after',
@@ -49,6 +61,7 @@ Example call:
         destinationId: string,
         opts: any
       ) => {
+        const { template, ...restOpts } = opts;
         const copyField: CopyField = {
           contentTypeId,
           fieldId,
@@ -59,11 +72,12 @@ Example call:
         return await cliCommand(
           ['copy', 'project', contentTypeId, fieldId, destinationId],
           opts,
-          mapContensisOpts({ copyField })
+          mapContensisOpts({ copyField, ...restOpts })
         ).CopyEntryField({
           commit: opts.commit,
           fromFile: opts.fromFile,
           logOutput: opts.outputEntries,
+          saveEntries: opts.saveEntries,
         });
       }
     );

package/src/commands/create.ts

@@ -18,7 +18,7 @@ export const makeCreateCommand = () => {
     .argument('<name>', 'the name of the project to create')
     .argument('[description]', 'optional description of the project')
     .option(
-      '-l --language',
+      '-l --language <language>',
       'the default language of the project to create',
       'en-GB'
     )

package/src/commands/get.ts

@@ -5,6 +5,7 @@ import {
   addGlobalOptions,
   assetTypes,
   contentTypes,
+  delivery,
   entryId,
   mapContensisOpts,
   zenql,
@@ -184,7 +185,8 @@ Example call:
           '-ob --order-by <orderBy...>',
           'field name(s) to order the results by (prefix "-" for descending)'
         )
-      );
+      )
+      .addOption(delivery);
 
   sharedGetEntryOptions(
     program
@@ -204,13 +206,13 @@ Example call:
   > get assets --zenql "sys.contentTypeId = blog" --fields sys.id sys.properties.filePath sys.properties.filename
 `
     )
-    .action(async (phrase: string, opts) => {
+    .action(async (search: string, opts) => {
       // Maintaining a separate command for assets vs entries
       // allows us to offer up more options when dealing with just assets
       await cliCommand(
         ['get', 'assets'],
         opts,
-        mapContensisOpts({ dataFormat: 'asset', phrase, ...opts })
+        mapContensisOpts({ dataFormat: 'asset', search, ...opts })
       ).GetEntries({});
     });
 
@@ -244,13 +246,11 @@ Example call:
   > get entries --content-type blog --fields entryTitle sys.version.modified --order-by -sys.version.modified
 `
     )
-    .action(async (phrase: string, opts, cmd) => {
-      // console.log('phrase: ', phrase, '\nopts:', JSON.stringify(opts, null, 2));
-      // console.log('opts:', JSON.stringify(opts, null, 2));
+    .action(async (search: string, opts, cmd) => {
       await cliCommand(
         ['get', 'entries'],
         opts,
-        mapContensisOpts({ phrase, ...opts })
+        mapContensisOpts({ search, ...opts })
       ).GetEntries({
         withDependents: opts.dependents,
       });

package/src/commands/globalOptions.ts

@@ -20,13 +20,14 @@ export const mapContensisOpts = (opts: any = {}): MigrateRequest => ({
   query:
     opts.id ||
     opts.entryIds ||
-    opts.phrase ||
+    opts.search ||
     opts.fields ||
     opts.orderBy ||
     opts.paths ||
     opts.assetType ||
     opts.contentType ||
-    opts.dataFormat
+    opts.dataFormat ||
+    opts.deliveryApi
       ? {
           assetTypes: opts.assetType,
           contentTypeIds: opts.contentType,
@@ -35,7 +36,8 @@ export const mapContensisOpts = (opts: any = {}): MigrateRequest => ({
           includeIds: opts.id || opts.entryIds,
           includePaths: opts.paths,
           orderBy: opts.orderBy,
-          searchTerm: opts.phrase,
+          searchTerm: opts.search,
+          useDelivery: opts.deliveryApi,
         }
       : undefined,
   zenQL: opts.zenql,
@@ -85,6 +87,14 @@ const sharedSecret = new Option(
 );
 
 /* Entry get options */
+export const delivery = new Option(
+  '-delivery --delivery-api',
+  'use delivery api to get the entries'
+);
+ export const search = new Option(
+   '--search <phrase>',
+   'get entries with the search phrase, use quotes for multiple words'
+ );
 export const zenql = new Option(
   '-q --zenql <zenql>',
   'get entries with a supplied ZenQL statement'

package/src/commands/import.ts

@@ -126,11 +126,11 @@ Example call:
   > import entries --from-file myImportData.json --preserve-guids
 `
     )
-    .action(async (phrase: string, opts, cmd) => {
+    .action(async (search: string, opts, cmd) => {
       await cliCommand(
         ['import', 'entries'],
         opts,
-        mapContensisOpts({ phrase, ...opts })
+        mapContensisOpts({ search, ...opts })
       ).ImportEntries({
         commit: opts.commit,
         fromFile: opts.fromFile,

package/src/localisation/en-GB.ts

@@ -183,9 +183,9 @@ export const LogMessages = {
     removed: (env: string, id: string, commit: boolean) =>
       `[${env}] ${
         commit ? `Deleted` : `Will delete`
-      } content type ${Logger.highlightText(id)}`,
+      } content type(s) ${Logger.highlightText(id)}`,
     failedRemove: (env: string, id: string) =>
-      `[${env}] Unable to delete content type ${Logger.highlightText(id)}`,
+      `[${env}] Unable to delete content type(s) ${Logger.highlightText(id)}`,
   },
   components: {
     list: (projectId: string) =>
@@ -199,9 +199,9 @@ export const LogMessages = {
     removed: (env: string, id: string, commit: boolean) =>
       `[${env}] ${
         commit ? `Deleted` : `Will delete`
-      } component ${Logger.highlightText(id)}`,
+      } component(s) ${Logger.highlightText(id)}`,
     failedRemove: (env: string, id: string) =>
-      `[${env}] Unable to delete component ${Logger.highlightText(id)}`,
+      `[${env}] Unable to delete component(s) ${Logger.highlightText(id)}`,
   },
   version: {
     set: (env: string, versionStatus: string) =>

package/src/services/ContensisCliService.ts

@@ -1406,7 +1406,7 @@ class ContensisCli {
         log.error(
           messages.contenttypes.failedRemove(
             currentProject,
-            contentTypeIds.join('", "')
+            contentTypeIds.join(', ')
           ),
           err
         );
@@ -1414,14 +1414,12 @@ class ContensisCli {
         log.success(
           messages.contenttypes.removed(
             currentProject,
-            contentTypeIds.join('", "'),
+            contentTypeIds.join(', '),
             !contensis.isPreview
           )
         );
         // print the results to console
-        await this.HandleFormattingAndOutput(result, () =>
-          log.object(jsonFormatter(result))
-        );
+        await this.HandleFormattingAndOutput(result, log.object);
       }
     }
   };
@@ -1452,28 +1450,37 @@ class ContensisCli {
     });
 
     if (contensis) {
-      // Pass each content type to the target repo
-      for (const contentType of fileData) {
-        // Fix invalid data
-        contentType.projectId = currentProject;
-        delete contentType.uuid;
-
-        const [err, created, createStatus] = await contensis.models.targetRepos[
-          currentProject
-        ].repo.UpsertContentType(false, contentType);
-
-        if (err) log.error(err.message, err);
-        if (createStatus) {
-          log.success(
-            messages.contenttypes.created(
-              currentProject,
-              contentType.id,
-              createStatus
-            )
-          );
-          // print the content type to console
-          await this.HandleFormattingAndOutput(contentType, () => {});
+      if (fromFile)
+        // Pass each content type to the target repo
+        for (const contentType of fileData) {
+          // Fix invalid data
+          contentType.projectId = currentProject;
+          delete contentType.uuid;
+
+          const [err, created, createStatus] =
+            await contensis.models.targetRepos[
+              currentProject
+            ].repo.UpsertContentType(false, contentType);
+
+          if (err) log.error(err.message, err);
+          if (createStatus) {
+            log.success(
+              messages.contenttypes.created(
+                currentProject,
+                contentType.id,
+                createStatus
+              )
+            );
+            // print the content type to console
+            await this.HandleFormattingAndOutput(contentType, () => {});
+          }
         }
+      else {
+        const result = await contensis.simpleMigration.Migrate(
+          contentTypeIds,
+          []
+        );
+        await this.HandleFormattingAndOutput(result, log.object);
       }
     }
   };
@@ -1590,7 +1597,7 @@ class ContensisCli {
         log.error(
           messages.components.failedRemove(
             currentProject,
-            componentIds.join('", "')
+            componentIds.join(', ')
           ),
           err
         );
@@ -1598,14 +1605,12 @@ class ContensisCli {
         log.success(
           messages.components.removed(
             currentProject,
-            componentIds.join('", "'),
+            componentIds.join(', '),
             !contensis.isPreview
           )
         );
         // print the results to console
-        await this.HandleFormattingAndOutput(result, () =>
-          log.info(jsonFormatter(result))
-        );
+        await this.HandleFormattingAndOutput(result, log.object);
       }
     }
   };
@@ -1637,27 +1642,36 @@ class ContensisCli {
 
     if (contensis) {
       // Pass each component to the target repo
-      for (const component of fileData) {
-        // Fix invalid data
-        component.projectId = currentProject;
-        delete component.uuid;
-
-        const [err, created, createStatus] = await contensis.models.targetRepos[
-          currentProject
-        ].repo.UpsertComponent(false, component);
-
-        if (err) log.error(err.message, err);
-        if (createStatus) {
-          log.success(
-            messages.components.created(
-              currentProject,
-              component.id,
-              createStatus
-            )
-          );
-          // print the component to console
-          await this.HandleFormattingAndOutput(component, () => {});
+      if (fromFile)
+        for (const component of fileData) {
+          // Fix invalid data
+          component.projectId = currentProject;
+          delete component.uuid;
+
+          const [err, created, createStatus] =
+            await contensis.models.targetRepos[
+              currentProject
+            ].repo.UpsertComponent(false, component);
+
+          if (err) log.error(err.message, err);
+          if (createStatus) {
+            log.success(
+              messages.components.created(
+                currentProject,
+                component.id,
+                createStatus
+              )
+            );
+            // print the component to console
+            await this.HandleFormattingAndOutput(component, () => {});
+          }
         }
+      else {
+        const result = await contensis.simpleMigration.Migrate(
+          [],
+          componentIds
+        );
+        await this.HandleFormattingAndOutput(result, log.object);
       }
     }
   };
@@ -1801,10 +1815,12 @@ class ContensisCli {
     commit,
     fromFile,
     logOutput,
+    saveEntries,
   }: {
     commit: boolean;
     fromFile: string;
     logOutput: string;
+    saveEntries: boolean;
   }) => {
     const { currentEnv, currentProject, log, messages } = this;
 
@@ -1827,8 +1843,13 @@ class ContensisCli {
       );
 
       if (err) logError(err);
-      if (result)
-        await this.HandleFormattingAndOutput(result, () => {
+      if (result) {
+        const output = saveEntries
+          ? contensis.content.copy.targets[currentProject].migrateEntries?.map(
+              me => me.finalEntry
+            )
+          : result;
+        await this.HandleFormattingAndOutput(output, () => {
           // print the migrateResult to console
           printEntriesMigrateResult(this, result, {
             showAll: logOutput === 'all',
@@ -1836,6 +1857,7 @@ class ContensisCli {
             showChanged: logOutput === 'changes',
           });
         });
+      }
 
       if (
         result &&

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.1.2-beta.9";
+export const LIB_VERSION = "1.2.0";

package/tsconfig.json

@@ -11,6 +11,7 @@
     "strict": true,
     "declaration": true,
     "resolveJsonModule": true,
+    "forceConsistentCasingInFileNames": true,
     "outDir": "dist",
     "baseUrl": ".",
     "paths": {