directus-template-cli 0.7.4 → 0.7.6

package/dist/services/github.js

@@ -1,7 +1,7 @@
+import { ux } from '@oclif/core';
 import { Octokit } from '@octokit/rest';
 import { DEFAULT_REPO } from '../lib/constants.js';
 import { parseGitHubUrl } from '../lib/utils/parse-github-url.js';
-import { ux } from '@oclif/core';
 export function createGitHub(token) {
     const octokit = new Octokit({
         auth: token,
@@ -19,9 +19,9 @@ export function createGitHub(token) {
             try {
                 const { data } = await octokit.rest.repos.getContent({
                     owner: repo.owner,
-                    repo: repo.repo,
                     path: repo.path || '',
                     ref: repo.ref,
+                    repo: repo.repo,
                 });
                 if (!Array.isArray(data))
                     return [];
@@ -31,7 +31,7 @@ export function createGitHub(token) {
                     .filter(item => item.type === 'dir')
                     .map(item => item.name);
             }
-            catch (error) {
+            catch {
                 // If we can't get contents, return empty array
                 // This indicates no frontends are available
                 return [];
@@ -53,7 +53,7 @@ export function createGitHub(token) {
                 .filter(item => item.type === 'dir' && item.name !== 'directus')
                 .map(item => item.name);
         }
-        catch (error) {
+        catch {
             // If we can't get contents, return empty array
             return [];
         }
@@ -74,13 +74,13 @@ export function createGitHub(token) {
             const packageJsonPath = joinPath(parsed.path || '', 'package.json');
             try {
                 const { data: packageJsonContent } = await octokit.rest.repos.getContent({
-                    owner: parsed.owner,
-                    repo: parsed.repo,
-                    path: packageJsonPath,
-                    ref: parsed.ref,
                     mediaType: {
                         format: 'raw',
                     },
+                    owner: parsed.owner,
+                    path: packageJsonPath,
+                    ref: parsed.ref,
+                    repo: parsed.repo,
                 });
                 // getContent with mediaType: raw returns string directly
                 if (typeof packageJsonContent === 'string') {
@@ -103,7 +103,7 @@ export function createGitHub(token) {
                 }
             }
             // Return a single item array for the direct URL case
-            return [{ id: customUrl, name, description }];
+            return [{ description, id: customUrl, name }];
         }
         const repo = customUrl ? parseGitHubUrl(customUrl) : DEFAULT_REPO;
         const { data: rootContent } = await octokit.rest.repos.getContent({
@@ -116,19 +116,19 @@ export function createGitHub(token) {
             return [];
         const directories = rootContent.filter(item => item.type === 'dir');
         // Fetch package.json for each directory concurrently
-        let templateInfos = await Promise.all(directories.map(async (dir) => {
+        const templateInfos = await Promise.all(directories.map(async (dir) => {
             const packageJsonPath = joinPath(repo.path || '', dir.path, 'package.json');
-            let name = dir.name;
+            let { name } = dir;
             let description;
             try {
                 const { data: packageJsonContent } = await octokit.rest.repos.getContent({
-                    owner: repo.owner,
-                    repo: repo.repo,
-                    path: packageJsonPath,
-                    ref: repo.ref,
                     mediaType: {
                         format: 'raw',
                     },
+                    owner: repo.owner,
+                    path: packageJsonPath,
+                    ref: repo.ref,
+                    repo: repo.repo,
                 });
                 // getContent with mediaType: raw returns string directly
                 if (typeof packageJsonContent === 'string') {
@@ -149,9 +149,9 @@ export function createGitHub(token) {
                 }
             }
             return {
+                description,
                 id: dir.name,
                 name,
-                description,
             };
         }));
         // Sort the templates to put "blank" last

package/dist/services/posthog.d.ts

@@ -24,16 +24,16 @@ export declare function shutdown(debug?: boolean): Promise<void>;
  * @param options.properties Optional additional properties to track
  * @param options.debug Whether to log debug information
  */
-export declare function track({ lifecycle, distinctId, command, flags, runId, message, config, properties, debug }: {
-    lifecycle: 'start' | 'complete' | 'error';
-    message?: string;
-    distinctId: string;
+export declare function track({ command, config, debug, distinctId, flags, lifecycle, message, properties, runId }: {
     command?: string;
-    flags?: Record<string, unknown>;
-    runId?: string;
     config?: Config;
-    properties?: Record<string, unknown>;
     debug?: boolean;
+    distinctId: string;
+    flags?: Record<string, unknown>;
+    lifecycle: 'complete' | 'error' | 'start';
+    message?: string;
+    properties?: Record<string, unknown>;
+    runId?: string;
 }): void;
 /**
  * Manually capture an exception in PostHog
@@ -42,9 +42,9 @@ export declare function track({ lifecycle, distinctId, command, flags, runId, me
  * @param properties Optional additional properties to track
  * @param debug Whether to log debug information
  */
-export declare function captureException({ error, distinctId, properties, debug }: {
-    error: unknown;
+export declare function captureException({ debug, distinctId, error, properties }: {
+    debug?: boolean;
     distinctId: string;
+    error: unknown;
     properties?: Record<string, unknown>;
-    debug?: boolean;
 }): void;

package/dist/services/posthog.js

@@ -1,6 +1,6 @@
 import { ux } from '@oclif/core';
 import { PostHog } from 'posthog-node';
-import { POSTHOG_PUBLIC_KEY, POSTHOG_HOST } from '../lib/constants.js';
+import { POSTHOG_HOST, POSTHOG_PUBLIC_KEY } from '../lib/constants.js';
 import { sanitizeFlags } from '../lib/utils/sanitize-flags.js';
 // Create a singleton client using module scope
 let client = null;
@@ -14,8 +14,8 @@ export function getClient(debug = false) {
         ux.stdout('Initializing PostHog client...');
     if (!client) {
         client = new PostHog(POSTHOG_PUBLIC_KEY, {
-            host: POSTHOG_HOST,
             disableGeoip: false,
+            host: POSTHOG_HOST,
         });
         // Add error handling
         client.on('error', err => {
@@ -58,14 +58,14 @@ export async function shutdown(debug = false) {
  * @param options.properties Optional additional properties to track
  * @param options.debug Whether to log debug information
  */
-export function track({ lifecycle, distinctId, command, flags, runId, message, config, properties = {}, debug = false }) {
+export function track({ command, config, debug = false, distinctId, flags, lifecycle, message, properties = {}, runId }) {
     if (debug)
         ux.stdout('Tracking event...');
     const phClient = getClient(debug);
     const eventProperties = command
         ? {
-            runId,
             message,
+            runId,
             ...properties,
             ...getEnvironmentInfo(config),
             // Always sanitize sensitive flags
@@ -91,7 +91,7 @@ export function track({ lifecycle, distinctId, command, flags, runId, message, c
  * @param properties Optional additional properties to track
  * @param debug Whether to log debug information
  */
-export function captureException({ error, distinctId, properties = {}, debug = false }) {
+export function captureException({ debug = false, distinctId, error, properties = {} }) {
     if (debug)
         ux.stdout('Capturing exception...');
     const phClient = getClient(debug);

package/oclif.manifest.json

@@ -42,6 +42,13 @@
           "multiple": false,
           "type": "option"
         },
+        "disableTelemetry": {
+          "description": "Disable telemetry",
+          "env": "DISABLE_TELEMETRY",
+          "name": "disableTelemetry",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "extensions": {
           "description": "Load Extensions",
           "name": "extensions",
@@ -60,6 +67,12 @@
           "allowNo": true,
           "type": "boolean"
         },
+        "noExit": {
+          "hidden": true,
+          "name": "noExit",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "partial": {
           "dependsOn": [
             "programmatic"
@@ -159,13 +172,6 @@
           "name": "users",
           "allowNo": true,
           "type": "boolean"
-        },
-        "disableTelemetry": {
-          "description": "Disable telemetry",
-          "env": "DISABLE_TELEMETRY",
-          "name": "disableTelemetry",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -231,6 +237,13 @@
           "multiple": false,
           "type": "option"
         },
+        "disableTelemetry": {
+          "description": "Disable telemetry",
+          "env": "DISABLE_TELEMETRY",
+          "name": "disableTelemetry",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "programmatic": {
           "char": "p",
           "description": "Run in programmatic mode (non-interactive) for use cases such as CI/CD pipelines.",
@@ -288,13 +301,6 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "disableTelemetry": {
-          "description": "Disable telemetry",
-          "env": "DISABLE_TELEMETRY",
-          "name": "disableTelemetry",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -330,6 +336,13 @@
         "$ directus-template-cli init my-project --frontend=nextjs --template=simple-cms"
       ],
       "flags": {
+        "disableTelemetry": {
+          "description": "Disable telemetry",
+          "env": "DISABLE_TELEMETRY",
+          "name": "disableTelemetry",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "frontend": {
           "description": "Frontend framework to use (e.g., nextjs, nuxt, astro)",
           "name": "frontend",
@@ -370,13 +383,6 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "disableTelemetry": {
-          "description": "Disable telemetry",
-          "env": "DISABLE_TELEMETRY",
-          "name": "disableTelemetry",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -395,5 +401,5 @@
       ]
     }
   },
-  "version": "0.7.4"
+  "version": "0.7.6"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-template-cli",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "CLI Utility for applying templates to a Directus instance.",
   "author": "bryantgillespie @bryantgillespie",
   "type": "module",
@@ -42,21 +42,21 @@
   },
   "devDependencies": {
     "@directus/types": "^13.0.0",
+    "@eslint/compat": "^1",
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4",
     "@types/chai": "^5.2.0",
     "@types/mocha": "^10",
     "@types/node": "^18",
     "chai": "^5.2.0",
-    "eslint": "^9",
-    "eslint-config-oclif": "^5",
-    "eslint-config-oclif-typescript": "^3",
-    "eslint-config-prettier": "^9",
+    "eslint": "^9.39.2",
+    "eslint-config-oclif": "^6.0.130",
+    "eslint-config-prettier": "^10",
     "mocha": "^10",
     "oclif": "^4",
+    "prettier": "^3.7.4",
     "shx": "^0.3.3",
     "ts-node": "^10",
-    "tslib": "^2.8.1",
     "typescript": "^5.8.2"
   },
   "oclif": {
@@ -85,7 +85,8 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "shx rm -rf dist && tsc -b",
-    "lint": "eslint . --ext .ts --config .eslintrc",
+    "format": "prettier --write .",
+    "lint": "eslint",
     "posttest": "pnpm run lint",
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md",