arri 0.0.37 → 0.0.40

package/dist/shared/{arri.edc9d295.cjs → arri.529292e9.cjs}

@@ -2,12 +2,84 @@
 
 const child_process = require('child_process');
 const require$$0 = require('fs');
-const app = require('./arri.8a065f92.cjs');
+const utils = require('./arri.0752aa2b.cjs');
 
 function defineClientGeneratorPlugin(plugin) {
   return plugin;
 }
 
+const JsonSchemaScalarTypeValues = [
+  "integer",
+  "number",
+  "bigint",
+  "string",
+  "boolean",
+  "Date"
+];
+const JsonSchemaNullTypeValues = ["null", "undefined"];
+function isJsonSchemaScalarType(input) {
+  if (typeof input !== "object") {
+    return false;
+  }
+  if (!("type" in input)) {
+    return false;
+  }
+  return JsonSchemaScalarTypeValues.includes(input.type);
+}
+function isJsonSchemaNullType(input) {
+  if (typeof input !== "object") {
+    return false;
+  }
+  if (!("type" in input)) {
+    return false;
+  }
+  return JsonSchemaNullTypeValues.includes(input.type);
+}
+const isJsonSchemaObject = (input) => {
+  if (typeof input !== "object") {
+    return false;
+  }
+  return "type" in input && input.type === "object" && "properties" in input && typeof input.properties === "object";
+};
+const isJsonSchemaRecord = (input) => {
+  if (typeof input !== "object") {
+    return false;
+  }
+  return "type" in input && input.type === "object" && "patternProperties" in input && typeof input.patternProperties === "object";
+};
+function isJsonSchemaArray(input) {
+  if (typeof input !== "object") {
+    return false;
+  }
+  if ("type" in input && input.type === "array") {
+    return true;
+  }
+  return false;
+}
+function isJsonSchemaEnum(input) {
+  if (typeof input !== "object") {
+    return false;
+  }
+  if (!("anyOf" in input) || !Array.isArray(input.anyOf)) {
+    return false;
+  }
+  let prevType;
+  for (const item of input.anyOf) {
+    if (!isJsonSchemaScalarType(item)) {
+      return false;
+    }
+    if (item.type !== "string" && item.type !== "integer" && item.type !== "number") {
+      return false;
+    }
+    if (!prevType) {
+      prevType = item.type;
+    } else if (prevType !== item.type) {
+      return false;
+    }
+  }
+  return true;
+}
+
 const dartClientGenerator = defineClientGeneratorPlugin(
   (options) => {
     return {
@@ -49,11 +121,11 @@ function createDartClient(appDef, opts = { clientName: "Client" }) {
   const { models, procedures } = appDef;
   const serviceParts = [];
   const procedureParts = [];
-  const services = app.unflattenProcedures(procedures);
+  const services = utils.unflattenProcedures(procedures);
   Object.keys(services).forEach((k) => {
     const item = services[k];
-    if (app.isServiceDef(item)) {
-      const serviceName = app.pascalCase(`${opts.clientName}_${k}_service`);
+    if (utils.isServiceDef(item)) {
+      const serviceName = utils.pascalCase(`${opts.clientName}_${k}_service`);
       serviceParts.push({
         name: serviceName,
         key: k,
@@ -74,11 +146,11 @@ function createDartClient(appDef, opts = { clientName: "Client" }) {
   const modelParts = [];
   Object.keys(models).forEach((key) => {
     const model = models[key];
-    const typeName = app.pascalCase(key);
+    const typeName = utils.pascalCase(key);
     const objModel = model;
     if (!generatedModels.includes(typeName)) {
       modelParts.push(
-        dartModelFromJsonSchema(`${app.pascalCase(key)}`, objModel)
+        dartModelFromJsonSchema(`${utils.pascalCase(key)}`, objModel)
       );
       generatedModels.push(typeName);
     }
@@ -110,7 +182,7 @@ ${modelParts.join("\n")}
 
 enum ${opts.clientName}Endpoints implements Comparable<${opts.clientName}Endpoints>, ArriEndpoint {
   ${Object.keys(endpoints).map(
-    (key) => `${app.camelCase(key.split("/").join("_"))}(
+    (key) => `${utils.camelCase(key.split("/").join("_"))}(
         path: "${key}",
         method: HttpMethod.${endpoints[key]},
       )`
@@ -134,13 +206,13 @@ function dartServiceFromServiceDefinition(name, def, opts) {
   const serviceName = `${name}`;
   Object.keys(def).forEach((key) => {
     const item = def[key];
-    if (app.isProcedureDef(item)) {
+    if (utils.isProcedureDef(item)) {
       rpcParts.push(dartProcedureFromServiceDefinition(key, item));
       return;
     }
     const nameParts = name.split("Service");
     nameParts.pop();
-    const subServiceName = app.pascalCase(
+    const subServiceName = utils.pascalCase(
       `${nameParts.join("")}_${key}_Service`
     );
     const subService = dartServiceFromServiceDefinition(
@@ -227,7 +299,7 @@ function dartProcedureFromServiceDefinition(key, def, opts) {
   }`;
 }
 function dartModelFromJsonSchema(modelName, schema, opts) {
-  const modelDisplayName = app.pascalCase(`${modelName}`);
+  const modelDisplayName = utils.pascalCase(`${modelName}`);
   const fields = [];
   const subModelParts = [];
   Object.entries(schema.properties ?? {}).forEach(([key, val]) => {
@@ -243,12 +315,12 @@ function dartModelFromJsonSchema(modelName, schema, opts) {
         subModelParts.push(sub);
       }
     }
-    fields.push({ type: dartType, name: app.camelCase(key), jsonKey: key });
-    if (!isDartType(dartType) && app.isJsonSchemaObject(val)) {
+    fields.push({ type: dartType, name: utils.camelCase(key), jsonKey: key });
+    if (!isDartType(dartType) && isJsonSchemaObject(val)) {
       if (val.$id && generatedModels.includes(val.$id)) {
         return;
       }
-      const subModelName = val.$id ? app.pascalCase(val.$id) : app.pascalCase(dartType.replace("?", ""));
+      const subModelName = val.$id ? utils.pascalCase(val.$id) : utils.pascalCase(dartType.replace("?", ""));
       subModelParts.push(
         dartModelFromJsonSchema(subModelName, val)
       );
@@ -320,21 +392,21 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
   const isOptional = !schema.required?.includes(propertyName);
   let finalType = "";
   const subTypes = [];
-  if (app.isJsonSchemaEnum(prop)) {
-    const enumName = app.pascalCase(`${objectName}_${propertyName}`);
+  if (isJsonSchemaEnum(prop)) {
+    const enumName = utils.pascalCase(`${objectName}_${propertyName}`);
     finalType = isOptional ? `${enumName}?` : enumName;
     const options = [];
     for (const opt of prop.anyOf) {
       if (opt.type === "string") {
         options.push({
-          name: app.camelCase(opt.const.toString()),
+          name: utils.camelCase(opt.const.toString()),
           type: "String",
           value: opt.const
         });
       }
       if (opt.type === "number" || opt.type === "integer") {
         options.push({
-          name: app.camelCase(
+          name: utils.camelCase(
             `num_${opt.const}`.split(".").join("Point")
           ),
           type: opt.type === "number" ? "double" : "int",
@@ -367,11 +439,11 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
 }`);
     return [finalType, subTypes];
   }
-  if (app.isJsonSchemaNullType(prop)) {
+  if (isJsonSchemaNullType(prop)) {
     finalType = "null";
     return [finalType, subTypes];
   }
-  if (app.isJsonSchemaScalarType(prop)) {
+  if (isJsonSchemaScalarType(prop)) {
     switch (prop.type) {
       case "string":
         finalType = isOptional ? "String?" : "String";
@@ -390,14 +462,14 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
         break;
     }
   }
-  if (app.isJsonSchemaObject(prop)) {
-    const joinedPropName = prop.$id ? app.pascalCase(prop.$id) : app.pascalCase(`${objectName}_${propertyName}`);
+  if (isJsonSchemaObject(prop)) {
+    const joinedPropName = prop.$id ? utils.pascalCase(prop.$id) : utils.pascalCase(`${objectName}_${propertyName}`);
     finalType = isOptional ? `${joinedPropName}?` : joinedPropName;
   }
-  if (app.isJsonSchemaRecord(prop)) {
+  if (isJsonSchemaRecord(prop)) {
     finalType = isOptional ? `Map<dynamic, dynamic>?` : "Map<dynamic, dynamic>";
   }
-  if (app.isJsonSchemaArray(prop)) {
+  if (isJsonSchemaArray(prop)) {
     const item = prop.items;
     const type = item.type;
     if (typeof type !== "string") {
@@ -425,8 +497,8 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
         finalType = isOptional ? "List<DateTime>?" : "List<DateTime>";
         break;
       case "object": {
-        if (app.isJsonSchemaObject(item)) {
-          const subTypeName = item.$id ?? app.pascalCase(`${objectName}_${propertyName}_item`);
+        if (isJsonSchemaObject(item)) {
+          const subTypeName = item.$id ?? utils.pascalCase(`${objectName}_${propertyName}_item`);
           if (!generatedModels.includes(subTypeName)) {
             const model = dartModelFromJsonSchema(
               subTypeName,
@@ -693,4 +765,10 @@ exports.dartServiceFromServiceDefinition = dartServiceFromServiceDefinition;
 exports.defineClientGeneratorPlugin = defineClientGeneratorPlugin;
 exports.isDartType = isDartType;
 exports.isDartTypeWithNullables = isDartTypeWithNullables;
+exports.isJsonSchemaArray = isJsonSchemaArray;
+exports.isJsonSchemaEnum = isJsonSchemaEnum;
+exports.isJsonSchemaNullType = isJsonSchemaNullType;
+exports.isJsonSchemaObject = isJsonSchemaObject;
+exports.isJsonSchemaRecord = isJsonSchemaRecord;
+exports.isJsonSchemaScalarType = isJsonSchemaScalarType;
 exports.transformers = transformers;

package/dist/shared/arri.ebf86912.mjs

@@ -0,0 +1,179 @@
+const NUMBER_CHAR_RE = /\d/;
+const STR_SPLITTERS = ["-", "_", "/", "."];
+function isUppercase(char = "") {
+  if (NUMBER_CHAR_RE.test(char)) {
+    return void 0;
+  }
+  return char.toUpperCase() === char;
+}
+function splitByCase(string_, separators) {
+  const splitters = separators ?? STR_SPLITTERS;
+  const parts = [];
+  if (!string_ || typeof string_ !== "string") {
+    return parts;
+  }
+  let buff = "";
+  let previousUpper;
+  let previousSplitter;
+  for (const char of string_) {
+    const isSplitter = splitters.includes(char);
+    if (isSplitter === true) {
+      parts.push(buff);
+      buff = "";
+      previousUpper = void 0;
+      continue;
+    }
+    const isUpper = isUppercase(char);
+    if (previousSplitter === false) {
+      if (previousUpper === false && isUpper === true) {
+        parts.push(buff);
+        buff = char;
+        previousUpper = isUpper;
+        continue;
+      }
+      if (previousUpper === true && isUpper === false && buff.length > 1) {
+        const lastChar = buff[buff.length - 1];
+        parts.push(buff.slice(0, Math.max(0, buff.length - 1)));
+        buff = lastChar + char;
+        previousUpper = isUpper;
+        continue;
+      }
+    }
+    buff += char;
+    previousUpper = isUpper;
+    previousSplitter = isSplitter;
+  }
+  parts.push(buff);
+  return parts;
+}
+function upperFirst(string_) {
+  return !string_ ? "" : string_[0].toUpperCase() + string_.slice(1);
+}
+function lowerFirst(string_) {
+  return !string_ ? "" : string_[0].toLowerCase() + string_.slice(1);
+}
+function pascalCase(string_) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => upperFirst(p)).join("");
+}
+function camelCase(string_) {
+  return lowerFirst(pascalCase(string_));
+}
+function kebabCase(string_, joiner) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => p.toLowerCase()).join(joiner ?? "-");
+}
+
+const HttpMethodValues = [
+  "get",
+  "post",
+  "put",
+  "patch",
+  "delete",
+  "head"
+];
+const isHttpMethod = (input) => {
+  if (typeof input !== "string") {
+    return false;
+  }
+  return HttpMethodValues.includes(input);
+};
+
+function normalizeWhitespace(input) {
+  if (input.includes("\n\n")) {
+    return normalizeWhitespace(input.split("\n\n").join("\n"));
+  }
+  const lines = [];
+  for (const line of input.split("\n")) {
+    lines.push(line.trim());
+  }
+  const result = lines.join("\n").trim();
+  if (result.includes("\n\n")) {
+    return normalizeWhitespace(result.split("\n\n").join("\n"));
+  }
+  return result;
+}
+function isProcedureDef(input) {
+  if (typeof input !== "object") {
+    return false;
+  }
+  const expectedKeys = ["path", "method"];
+  const existingKeys = Object.keys(input);
+  for (const key of expectedKeys) {
+    if (!existingKeys.includes(key)) {
+      return false;
+    }
+  }
+  return isHttpMethod(input.method) && typeof input.path === "string" && (typeof input.params === "string" || typeof input.params === "undefined") && (typeof input.response === "string" || typeof input.response === "undefined");
+}
+function isServiceDef(input) {
+  if (typeof input !== "object") {
+    return false;
+  }
+  for (const key of Object.keys(input)) {
+    if (typeof input[key] !== "object") {
+      return false;
+    }
+  }
+  return true;
+}
+function isApplicationDef(input) {
+  if (typeof input !== "object") {
+    return false;
+  }
+  if (!("procedures" in input) || typeof input.procedures !== "object") {
+    return false;
+  }
+  if (!("models" in input) || typeof input.models !== "object") {
+    return false;
+  }
+  if (!("errors" in input) || typeof input.errors !== "object") {
+    return false;
+  }
+  return true;
+}
+function unflattenObject(data) {
+  if (Object(data) !== data || Array.isArray(data))
+    return data;
+  const regex = /\.?([^.[\]]+)|\[(\d+)\]/g;
+  const result = {};
+  for (const p in data) {
+    let cur = result;
+    let prop = "";
+    let m;
+    while (m = regex.exec(p)) {
+      cur = cur[prop] || (cur[prop] = m[2] ? [] : {});
+      prop = m[2] || m[1];
+    }
+    cur[prop] = data[p];
+  }
+  return result[""] || result;
+}
+function unflattenProcedures(procedures) {
+  return unflattenObject(procedures);
+}
+function setNestedObjectProperty(targetProp, value, object) {
+  const parts = targetProp.split(".");
+  let current = object;
+  for (let i = 0; i < parts.length; i++) {
+    const key = parts[i];
+    if (i === parts.length - 1) {
+      current[key] = value;
+    } else {
+      if (!current[key]) {
+        current[key] = {};
+      }
+      current = current[key];
+    }
+  }
+  return object;
+}
+const removeDisallowedChars = (input, disallowedChars) => {
+  let result = input;
+  for (const char of disallowedChars) {
+    if (result.includes(char)) {
+      result = result.split(char).join("");
+    }
+  }
+  return result;
+};
+
+export { isProcedureDef as a, unflattenProcedures as b, camelCase as c, isApplicationDef as d, isHttpMethod as e, isServiceDef as i, kebabCase as k, normalizeWhitespace as n, pascalCase as p, removeDisallowedChars as r, setNestedObjectProperty as s, unflattenObject as u };

package/package.json

@@ -18,14 +18,14 @@
     "scule": "^1.0.0",
     "globby": "^13.2.2",
     "pathe": "^1.1.1",
-    "citty": "^0.1.3",
+    "citty": "^0.1.4",
     "c12": "^1.4.2",
     "consola": "^3.2.3",
     "ofetch": "^1.3.3",
     "chokidar": "^3.5.3",
-    "listhen": "^1.4.7"
+    "listhen": "^1.5.0"
   },
-  "version": "0.0.37",
+  "version": "0.0.40",
   "repository": {
     "url": "https://github.com/modiimedia/arri"
   }