@prisma/cli-init 0.6.1 → 0.7.0

package/dist/{accelerate-MP5P6O6M.js → accelerate-7HJZB2GE.js}

@@ -136717,20 +136717,6 @@ function _setPrototypeOf(o, p) {
   };
   return _setPrototypeOf(o, p);
 }
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null)
-    return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0)
-      continue;
-    target[key] = source[key];
-  }
-  return target;
-}
 var Identifier = /* @__PURE__ */ createToken({
   name: "Identifier",
   pattern: /[a-zA-Z][\w-]*/
@@ -136894,17 +136880,6 @@ var multiModeTokens = {
   defaultMode: "global"
 };
 var PrismaLexer = /* @__PURE__ */ new Lexer(multiModeTokens);
-var schemaObjects = ["model", "view", "type"];
-function isOneOfSchemaObjects(obj, schemas) {
-  return obj != null && "type" in obj && schemas.includes(obj.type);
-}
-function isSchemaObject(obj) {
-  return isOneOfSchemaObjects(obj, schemaObjects);
-}
-var fieldObjects = ["field", "enumerator"];
-function isSchemaField(field) {
-  return field != null && "type" in field && fieldObjects.includes(field.type);
-}
 function isToken(node) {
   return "image" in node[0];
 }
@@ -137867,451 +137842,6 @@ function computePropertyFormatting(list) {
     return printProperty(prop, nameLengths[0], typeLengths[0]);
   }).filter(Boolean).join(EOL + "  ").replace(/(\r?\n\s*){3,}/g, EOL + EOL + "  ");
 }
-var findByType = function findByType2(list, typeToMatch, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  var _list$filter = list.filter(findBy(typeToMatch, options)), match = _list$filter[0], unexpected = _list$filter[1];
-  if (!match)
-    return null;
-  if (unexpected)
-    throw new Error("Found multiple blocks with [type=" + typeToMatch + "]");
-  return match;
-};
-var findAllByType = function findAllByType2(list, typeToMatch, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return list.filter(findBy(typeToMatch, options));
-};
-var findBy = function findBy2(typeToMatch, _temp) {
-  var _ref = _temp === void 0 ? {} : _temp, name = _ref.name;
-  return function(block) {
-    if (name != null) {
-      var nameAttribute = typeToMatch === "assignment" ? "key" : "name";
-      if (!(nameAttribute in block))
-        return false;
-      var nameMatches = typeof name === "string" ? block[nameAttribute] === name : name.test(block[nameAttribute]);
-      if (!nameMatches)
-        return false;
-    }
-    return block.type === typeToMatch;
-  };
-};
-var _excluded = ["within"];
-var _excluded2 = ["within"];
-var ConcretePrismaSchemaBuilder = /* @__PURE__ */ function() {
-  function ConcretePrismaSchemaBuilder2(source) {
-    if (source === void 0) {
-      source = "";
-    }
-    this.schema = void 0;
-    this._subject = void 0;
-    this._parent = void 0;
-    this.schema = getSchema(source);
-  }
-  var _proto = ConcretePrismaSchemaBuilder2.prototype;
-  _proto.print = function print(options) {
-    if (options === void 0) {
-      options = {};
-    }
-    return printSchema(this.schema, options);
-  };
-  _proto.getSchema = function getSchema2() {
-    return this.schema;
-  };
-  _proto.generator = function generator(name, provider) {
-    if (provider === void 0) {
-      provider = "prisma-client-js";
-    }
-    var generator2 = this.schema.list.reduce(function(memo, block) {
-      return block.type === "generator" && block.name === name ? block : memo;
-    }, {
-      type: "generator",
-      name,
-      assignments: [{
-        type: "assignment",
-        key: "provider",
-        value: '"' + provider + '"'
-      }]
-    });
-    if (!this.schema.list.includes(generator2))
-      this.schema.list.push(generator2);
-    this._subject = generator2;
-    return this;
-  };
-  _proto.drop = function drop(name) {
-    var index = this.schema.list.findIndex(function(block) {
-      return "name" in block && block.name === name;
-    });
-    if (index !== -1)
-      this.schema.list.splice(index, 1);
-    return this;
-  };
-  _proto.datasource = function datasource(provider, url) {
-    var datasource2 = {
-      type: "datasource",
-      name: "db",
-      assignments: [{
-        type: "assignment",
-        key: "url",
-        value: typeof url === "string" ? '"' + url + '"' : {
-          type: "function",
-          name: "env",
-          params: ['"' + url.env + '"']
-        }
-      }, {
-        type: "assignment",
-        key: "provider",
-        value: provider
-      }]
-    };
-    var existingIndex = this.schema.list.findIndex(function(block) {
-      return block.type === "datasource";
-    });
-    this.schema.list.splice(existingIndex, existingIndex !== -1 ? 1 : 0, datasource2);
-    this._subject = datasource2;
-    return this;
-  };
-  _proto.model = function model(name) {
-    var model2 = this.schema.list.reduce(function(memo, block) {
-      return block.type === "model" && block.name === name ? block : memo;
-    }, {
-      type: "model",
-      name,
-      properties: []
-    });
-    if (!this.schema.list.includes(model2))
-      this.schema.list.push(model2);
-    this._subject = model2;
-    return this;
-  };
-  _proto.view = function view(name) {
-    var view2 = this.schema.list.reduce(function(memo, block) {
-      return block.type === "view" && block.name === name ? block : memo;
-    }, {
-      type: "view",
-      name,
-      properties: []
-    });
-    if (!this.schema.list.includes(view2))
-      this.schema.list.push(view2);
-    this._subject = view2;
-    return this;
-  };
-  _proto.type = function type(name) {
-    var type2 = this.schema.list.reduce(function(memo, block) {
-      return block.type === "type" && block.name === name ? block : memo;
-    }, {
-      type: "type",
-      name,
-      properties: []
-    });
-    if (!this.schema.list.includes(type2))
-      this.schema.list.push(type2);
-    this._subject = type2;
-    return this;
-  };
-  _proto["enum"] = function _enum(name, enumeratorNames) {
-    if (enumeratorNames === void 0) {
-      enumeratorNames = [];
-    }
-    var e = this.schema.list.reduce(function(memo, block) {
-      return block.type === "enum" && block.name === name ? block : memo;
-    }, {
-      type: "enum",
-      name,
-      enumerators: enumeratorNames.map(function(name2) {
-        return {
-          type: "enumerator",
-          name: name2
-        };
-      })
-    });
-    if (!this.schema.list.includes(e))
-      this.schema.list.push(e);
-    this._subject = e;
-    return this;
-  };
-  _proto.enumerator = function enumerator(value) {
-    var subject = this.getSubject();
-    if (!subject || !("type" in subject) || subject.type !== "enum") {
-      throw new Error("Subject must be a prisma enum!");
-    }
-    var enumerator2 = {
-      type: "enumerator",
-      name: value
-    };
-    subject.enumerators.push(enumerator2);
-    this._parent = this._subject;
-    this._subject = enumerator2;
-    return this;
-  };
-  _proto.getSubject = function getSubject() {
-    return this._subject;
-  };
-  _proto.getParent = function getParent() {
-    return this._parent;
-  };
-  _proto.blockAttribute = function blockAttribute(name, args) {
-    var subject = this.getSubject();
-    if (subject.type !== "enum" && !isSchemaObject(subject)) {
-      var parent = this.getParent();
-      if (!isOneOfSchemaObjects(parent, ["model", "view", "type", "enum"]))
-        throw new Error("Subject must be a prisma model, view, or type!");
-      subject = this._subject = parent;
-    }
-    var attributeArgs = function() {
-      if (!args)
-        return [];
-      if (typeof args === "string")
-        return [{
-          type: "attributeArgument",
-          value: '"' + args + '"'
-        }];
-      if (Array.isArray(args))
-        return [{
-          type: "attributeArgument",
-          value: {
-            type: "array",
-            args
-          }
-        }];
-      return Object.entries(args).map(function(_ref) {
-        var key = _ref[0], value = _ref[1];
-        return {
-          type: "attributeArgument",
-          value: {
-            type: "keyValue",
-            key,
-            value
-          }
-        };
-      });
-    }();
-    var property = {
-      type: "attribute",
-      kind: "object",
-      name,
-      args: attributeArgs
-    };
-    if (subject.type === "enum") {
-      subject.enumerators.push(property);
-    } else {
-      subject.properties.push(property);
-    }
-    return this;
-  };
-  _proto.attribute = function attribute(name, args) {
-    var parent = this.getParent();
-    var subject = this.getSubject();
-    if (!isOneOfSchemaObjects(parent, ["model", "view", "type", "enum"])) {
-      throw new Error("Parent must be a prisma model or view!");
-    }
-    if (!isSchemaField(subject)) {
-      throw new Error("Subject must be a prisma field or enumerator!");
-    }
-    if (!subject.attributes)
-      subject.attributes = [];
-    var attribute2 = subject.attributes.reduce(function(memo, attr) {
-      return attr.type === "attribute" && (attr.group ? attr.group + "." : "") + attr.name === name ? attr : memo;
-    }, {
-      type: "attribute",
-      kind: "field",
-      name
-    });
-    if (Array.isArray(args)) {
-      var mapArg = function mapArg2(arg) {
-        var _arg$function$map, _arg$function;
-        return typeof arg === "string" ? arg : {
-          type: "function",
-          name: arg.name,
-          params: (_arg$function$map = (_arg$function = arg["function"]) == null ? void 0 : _arg$function.map(mapArg2)) != null ? _arg$function$map : []
-        };
-      };
-      if (args.length > 0)
-        attribute2.args = args.map(function(arg) {
-          return {
-            type: "attributeArgument",
-            value: mapArg(arg)
-          };
-        });
-    } else if (typeof args === "object") {
-      attribute2.args = Object.entries(args).map(function(_ref2) {
-        var key = _ref2[0], value = _ref2[1];
-        return {
-          type: "attributeArgument",
-          value: {
-            type: "keyValue",
-            key,
-            value: {
-              type: "array",
-              args: value
-            }
-          }
-        };
-      });
-    }
-    if (!subject.attributes.includes(attribute2))
-      subject.attributes.push(attribute2);
-    return this;
-  };
-  _proto.removeAttribute = function removeAttribute(name) {
-    var parent = this.getParent();
-    var subject = this.getSubject();
-    if (!isSchemaObject(parent)) {
-      throw new Error("Parent must be a prisma model or view!");
-    }
-    if (!isSchemaField(subject)) {
-      throw new Error("Subject must be a prisma field!");
-    }
-    if (!subject.attributes)
-      subject.attributes = [];
-    subject.attributes = subject.attributes.filter(function(attr) {
-      return !(attr.type === "attribute" && attr.name === name);
-    });
-    return this;
-  };
-  _proto.assignment = function assignment(key, value) {
-    var subject = this.getSubject();
-    if (!subject || !("type" in subject) || !["generator", "datasource"].includes(subject.type))
-      throw new Error("Subject must be a prisma generator or datasource!");
-    function tap(subject2, callback) {
-      callback(subject2);
-      return subject2;
-    }
-    var assignment2 = subject.assignments.reduce(function(memo, assignment3) {
-      return assignment3.type === "assignment" && assignment3.key === key ? tap(assignment3, function(a) {
-        a.value = '"' + value + '"';
-      }) : memo;
-    }, {
-      type: "assignment",
-      key,
-      value: '"' + value + '"'
-    });
-    if (!subject.assignments.includes(assignment2))
-      subject.assignments.push(assignment2);
-    return this;
-  };
-  _proto.findByType = function findByType$1(typeToMatch, _ref3) {
-    var _ref3$within = _ref3.within, within = _ref3$within === void 0 ? this.schema.list : _ref3$within, options = _objectWithoutPropertiesLoose(_ref3, _excluded);
-    return findByType(within, typeToMatch, options);
-  };
-  _proto.findAllByType = function findAllByType$1(typeToMatch, _ref4) {
-    var _ref4$within = _ref4.within, within = _ref4$within === void 0 ? this.schema.list : _ref4$within, options = _objectWithoutPropertiesLoose(_ref4, _excluded2);
-    return findAllByType(within, typeToMatch, options);
-  };
-  _proto.blockInsert = function blockInsert(statement) {
-    var subject = this.getSubject();
-    var allowed = ["datasource", "enum", "generator", "model", "view", "type"];
-    if (!subject || !("type" in subject) || !allowed.includes(subject.type)) {
-      var parent = this.getParent();
-      if (!parent || !("type" in parent) || !allowed.includes(parent.type)) {
-        throw new Error("Subject must be a prisma block!");
-      }
-      subject = this._subject = parent;
-    }
-    switch (subject.type) {
-      case "datasource": {
-        subject.assignments.push(statement);
-        break;
-      }
-      case "enum": {
-        subject.enumerators.push(statement);
-        break;
-      }
-      case "generator": {
-        subject.assignments.push(statement);
-        break;
-      }
-      case "model": {
-        subject.properties.push(statement);
-        break;
-      }
-    }
-    return this;
-  };
-  _proto["break"] = function _break() {
-    var lineBreak = {
-      type: "break"
-    };
-    return this.blockInsert(lineBreak);
-  };
-  _proto.comment = function comment(text, node) {
-    if (node === void 0) {
-      node = false;
-    }
-    var comment2 = {
-      type: "comment",
-      text: "//" + (node ? "/" : "") + " " + text
-    };
-    return this.blockInsert(comment2);
-  };
-  _proto.schemaComment = function schemaComment(text, node) {
-    if (node === void 0) {
-      node = false;
-    }
-    var comment = {
-      type: "comment",
-      text: "//" + (node ? "/" : "") + " " + text
-    };
-    this.schema.list.push(comment);
-    return this;
-  };
-  _proto.field = function field(name, fieldType) {
-    if (fieldType === void 0) {
-      fieldType = "String";
-    }
-    var subject = this.getSubject();
-    if (!isSchemaObject(subject)) {
-      var parent = this.getParent();
-      if (!isSchemaObject(parent))
-        throw new Error("Subject must be a prisma model or view or composite type!");
-      subject = this._subject = parent;
-    }
-    var field2 = subject.properties.reduce(function(memo, block) {
-      return block.type === "field" && block.name === name ? block : memo;
-    }, {
-      type: "field",
-      name,
-      fieldType
-    });
-    if (!subject.properties.includes(field2))
-      subject.properties.push(field2);
-    this._parent = subject;
-    this._subject = field2;
-    return this;
-  };
-  _proto.removeField = function removeField(name) {
-    var subject = this.getSubject();
-    if (!isSchemaObject(subject)) {
-      var parent = this.getParent();
-      if (!isSchemaObject(parent))
-        throw new Error("Subject must be a prisma model or view or composite type!");
-      subject = this._subject = parent;
-    }
-    subject.properties = subject.properties.filter(function(field) {
-      return !(field.type === "field" && field.name === name);
-    });
-    return this;
-  };
-  _proto.then = function then(callback) {
-    callback(this._subject);
-    return this;
-  };
-  return ConcretePrismaSchemaBuilder2;
-}();
-function createPrismaSchemaBuilder(source) {
-  return new ConcretePrismaSchemaBuilder(source);
-}
-function produceSchema(source, producer, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  var builder = createPrismaSchemaBuilder(source);
-  producer(builder);
-  return builder.print(options);
-}
 
 // ../../dev/server/src/schema.ts
 var SCHEMAS_BY_HASH = /* @__PURE__ */ new Map();
@@ -138332,10 +137862,21 @@ function assertSchema(ctx) {
   return { schemaHash, schemas };
 }
 async function overrideDatasource(base64Schema, connectionString, debug) {
-  const schema = Buffer2.from(base64Schema, "base64").toString("utf8");
-  const schemaWithOverride = produceSchema(schema, (builder) => {
-    builder.datasource('"postgresql"', connectionString.toString());
-  });
+  const rawSchema = Buffer2.from(base64Schema, "base64").toString("utf8");
+  const schema = getSchema(rawSchema);
+  const datasourceNode = schema.list.find((item) => item.type === "datasource");
+  if (!datasourceNode) {
+    throw new Error("No datasource block found in schema.");
+  }
+  const urlAssignment = datasourceNode.assignments.find(
+    (assignment) => assignment.type === "assignment" && assignment.key === "url"
+  );
+  if (!urlAssignment) {
+    datasourceNode.assignments.push({ key: "url", type: "assignment", value: `"${connectionString.toString()}"` });
+  } else {
+    urlAssignment.value = `"${connectionString.toString()}"`;
+  }
+  const schemaWithOverride = printSchema(schema);
   if (debug) {
     console.log("[Accelerate] schema with override:", schemaWithOverride);
   }

package/dist/index.js

@@ -2638,7 +2638,7 @@ async function getApp(port, dbServer, serverState) {
   const { debug: debug3 } = serverState;
   const [{ Hono }, { accelerateRoute }, { utilityRoute }] = await Promise.all([
     import("hono/tiny"),
-    import("./accelerate-MP5P6O6M.js"),
+    import("./accelerate-7HJZB2GE.js"),
     import("./utility-QJR3G2JJ.js")
   ]);
   const app = new Hono();
@@ -2737,7 +2737,7 @@ var ServerState = class {
     this._shadowDatabasePort = options.shadowDatabasePort ?? NO_PORT;
   }
   static async createExclusively(options) {
-    const serverState = options?.dryRun !== true && options?.persistenceMode !== "stateless" ? new StatefulServerState(options) : new StatelessServerState(options);
+    const serverState = options?.dryRun !== true && options?.persistenceMode === "stateful" ? new StatefulServerState(options) : new StatelessServerState(options);
     await serverState[PRIVATE_INITIALIZE_SYMBOL]();
     return serverState;
   }
@@ -2805,10 +2805,10 @@ var StatelessServerState = class extends ServerState {
   constructor(options) {
     super({
       ...options,
-      databasePort: options?.databasePort ?? DEFAULT_DATABASE_PORT,
+      databasePort: options?.databasePort,
       persistenceMode: "stateless",
-      port: options?.port ?? DEFAULT_SERVER_PORT,
-      shadowDatabasePort: options?.shadowDatabasePort ?? DEFAULT_SHADOW_DATABASE_PORT
+      port: options?.port,
+      shadowDatabasePort: options?.shadowDatabasePort
     });
   }
   get databaseDumpPath() {
@@ -2818,6 +2818,31 @@ var StatelessServerState = class extends ServerState {
     return "memory://";
   }
   async [PRIVATE_INITIALIZE_SYMBOL]() {
+    let servers;
+    try {
+      servers = await ServerState.scan({ debug: this.debug, onlyMetadata: true });
+    } catch (error) {
+      if (this.debug) {
+        console.warn(
+          `[State] failed to scan for existing servers, assuming filesystem does not exist or other reasons.`,
+          error
+        );
+      }
+      servers = [];
+    }
+    const ports = await pickPorts({
+      debug: this.debug,
+      name: this.dryRun ? this.name : "",
+      requestedPorts: {
+        databasePort: this.databasePort,
+        port: this.port,
+        shadowDatabasePort: this.shadowDatabasePort
+      },
+      servers
+    });
+    this._databasePort = ports.databasePort;
+    this._port = ports.port;
+    this._shadowDatabasePort = ports.shadowDatabasePort;
   }
   async close() {
   }
@@ -3565,16 +3590,18 @@ model User {
 var defaultEnv = async (url2, debug3 = false, comments = true) => {
   if (url2 === void 0) {
     let created = false;
-    const state = await ServerState.fromServerDump({ debug: debug3 }) || (created = true, await ServerState.createExclusively({ persistenceMode: "stateful", debug: debug3 }));
+    const state = await ServerState.fromServerDump({ debug: debug3 }) || (created = true, await ServerState.createExclusively({ debug: debug3, persistenceMode: "stateful" }));
     if (created) {
       await state.close();
     }
     const server = await startPrismaDevServer({
       databasePort: state.databasePort,
+      debug: debug3,
       dryRun: true,
+      name: state.name,
+      persistenceMode: "stateful",
       port: state.port,
-      shadowDatabasePort: state.shadowDatabasePort,
-      debug: debug3
+      shadowDatabasePort: state.shadowDatabasePort
     });
     url2 = server.ppg.url;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli-init",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Init CLI for Prisma",
   "type": "module",
   "sideEffects": false,
@@ -36,7 +36,7 @@
     "tsup": "8.0.2",
     "typescript": "5.8.3",
     "vitest": "3.1.3",
-    "@prisma/dev": "0.15.0"
+    "@prisma/dev": "0.16.1"
   },
   "dependencies": {
     "@inquirer/prompts": "7.3.3",