@cedarjs/cli 6.0.0-canary.2921 → 6.0.0-canary.2924

package/dist/commands/execHandler.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { context } from "@opentelemetry/api";
 import { suppressTracing } from "@opentelemetry/core";
 import { Listr } from "listr2";
+import { Parser } from "yargs/helpers";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { findScripts } from "@cedarjs/internal/dist/files";
 import { runScriptFunction } from "../lib/exec.js";
@@ -50,6 +51,17 @@ const handler = async (args) => {
   delete scriptArgs.l;
   delete scriptArgs.s;
   delete scriptArgs.silent;
+  if (Array.isArray(scriptArgs._)) {
+    const dashBlockIndex = scriptArgs._.findIndex(
+      (arg) => typeof arg === "string" && arg.startsWith("-")
+    );
+    if (dashBlockIndex !== -1) {
+      const unparsedTail = scriptArgs._.splice(dashBlockIndex);
+      const { _: reparsedPositionals, ...reparsedFlags } = Parser(unparsedTail);
+      scriptArgs._.push(...reparsedPositionals);
+      Object.assign(scriptArgs, reparsedFlags);
+    }
+  }
   const scriptPath = resolveScriptPath(name);
   if (!scriptPath) {
     console.error(

package/dist/commands/generate/script/templates/script.ts.template

@@ -3,12 +3,17 @@
 // To access your database uncomment the line below
 // import { db } from 'api/src/lib/db'
 
-interface Args {
-  _: string[]
-  [key: string]: unknown
+interface ScriptArgs {
+  args: {
+    // positional args, e.g. `yarn cedar exec myScript foo 123` -> ['foo', 123]
+    // numeric-looking args are parsed as numbers, others as strings
+    _: Array<string | number>
+    // named flags, e.g. `--force` -> { force: true }
+    [flag: string]: unknown
+  }
 }
 
-export default async ({ args }: Args) => {
+export default async ({ args }: ScriptArgs) => {
   // Your script here...
   console.log(':: Executing script with args ::')
   console.log(args)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2921",
+  "version": "6.0.0-canary.2924",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-canary.2921",
-    "@cedarjs/babel-config": "6.0.0-canary.2921",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2921",
-    "@cedarjs/internal": "6.0.0-canary.2921",
-    "@cedarjs/prerender": "6.0.0-canary.2921",
-    "@cedarjs/project-config": "6.0.0-canary.2921",
-    "@cedarjs/structure": "6.0.0-canary.2921",
-    "@cedarjs/telemetry": "6.0.0-canary.2921",
-    "@cedarjs/utils": "6.0.0-canary.2921",
-    "@cedarjs/vite": "6.0.0-canary.2921",
-    "@cedarjs/web-server": "6.0.0-canary.2921",
+    "@cedarjs/api-server": "6.0.0-canary.2924",
+    "@cedarjs/babel-config": "6.0.0-canary.2924",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2924",
+    "@cedarjs/internal": "6.0.0-canary.2924",
+    "@cedarjs/prerender": "6.0.0-canary.2924",
+    "@cedarjs/project-config": "6.0.0-canary.2924",
+    "@cedarjs/structure": "6.0.0-canary.2924",
+    "@cedarjs/telemetry": "6.0.0-canary.2924",
+    "@cedarjs/utils": "6.0.0-canary.2924",
+    "@cedarjs/vite": "6.0.0-canary.2924",
+    "@cedarjs/web-server": "6.0.0-canary.2924",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -82,7 +82,7 @@
     "prettier": "3.8.4",
     "prisma": "7.8.0",
     "prompts": "2.4.2",
-    "semver": "7.7.4",
+    "semver": "7.8.5",
     "smol-toml": "1.6.1",
     "srvx": "0.11.16",
     "string-env-interpolation": "1.0.1",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2921",
+    "@cedarjs/framework-tools": "6.0.0-canary.2924",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.1",