@arrirpc/codegen-utils 0.69.1 → 0.70.1

package/dist/index.cjs

@@ -1,89 +1,13 @@
 'use strict';
 
+const typeDefs = require('@arrirpc/type-defs');
 const scule = require('scule');
-const jtdUtils = require('jtd-utils');
 
-const HttpMethodValues = [
-  "get",
-  "post",
-  "put",
-  "patch",
-  "delete",
-  "head"
-];
-const isHttpMethod = (input) => {
-  if (typeof input !== "string") {
-    return false;
-  }
-  return HttpMethodValues.includes(input);
-};
-const isRpcHttpMethod = (input) => {
-  return isHttpMethod(input) && input !== "head";
-};
-const SCHEMA_VERSION = "0.0.7";
-function isAppDefinition(input) {
-  if (typeof input !== "object") {
-    return false;
-  }
-  const inputObj = input;
-  if (typeof inputObj.schemaVersion !== "string") {
-    return false;
-  }
-  if (typeof inputObj.procedures !== "object") {
-    return false;
-  }
-  if (typeof inputObj.definitions !== "object") {
-    return false;
-  }
-  return true;
-}
-function isRpcDefinitionBase(input) {
-  if (typeof input !== "object" || input === null) {
-    return false;
-  }
-  if ("params" in input && typeof input.params !== "undefined" && typeof input.params !== "string") {
-    return false;
-  }
-  if ("response" in input && typeof input.response !== "undefined" && typeof input.response !== "string") {
-    return false;
-  }
-  return "transport" in input && typeof input.transport === "string" && input.transport.length > 0 && "path" in input && typeof input.path === "string" && input.path.length > 0;
-}
-function isRpcDefinition(input) {
-  if (!isRpcDefinitionBase(input)) {
-    return false;
-  }
-  if (!("transport" in input) || typeof input.transport !== "string") {
-    return false;
-  }
-  if (input.transport === "http") {
-    return "method" in input && isRpcHttpMethod(input.method);
-  }
-  if (input.transport === "ws") {
-    return true;
-  }
-  if (input.transport.startsWith("custom:")) {
-    return true;
-  }
-  return false;
-}
-function isServiceDefinition(input) {
-  if (typeof input !== "object") {
-    return false;
-  }
-  for (const key of Object.keys(input)) {
-    if (typeof input[key] !== "object") {
-      return false;
-    }
-  }
-  return true;
-}
 function unflattenProcedures(procedures) {
   return unflattenObject(procedures);
 }
 function unflattenObject(data) {
-  if (Object(data) !== data || Array.isArray(data))
-    return data;
+  if (Object(data) !== data || Array.isArray(data)) return data;
   const regex = /\.?([^.[\]]+)|\[(\d+)\]/g;
   const result = {};
   for (const p in data) {
@@ -138,60 +62,30 @@ function normalizeWhitespace(input) {
   }
   return result;
 }
-function defineGeneratorPlugin(plugin) {
-  return plugin;
-}
-function createAppDefinition(input) {
-  const definitions = { ...input.definitions };
-  const procedures = {};
-  for (const key of Object.keys(input.procedures)) {
-    const def = input.procedures[key];
-    let paramName;
-    if (def.params) {
-      paramName = def.params.metadata?.id ?? scule.pascalCase(`${key.split(".").join("_")}Params`);
-      definitions[paramName] = def.params;
-    }
-    let responseName;
-    if (def.response) {
-      responseName = def.response.metadata?.id ?? scule.pascalCase(`${key.split(".").join("_")}Response`);
-      definitions[responseName] = def.response;
-    }
-    delete def.params;
-    delete def.response;
-    procedures[key] = {
-      ...def,
-      params: paramName,
-      response: responseName
-    };
-  }
-  const result = {
-    schemaVersion: "0.0.7",
-    ...input,
-    procedures,
-    definitions
-  };
-  return result;
-}
 
-exports.HttpMethodValues = HttpMethodValues;
-exports.SCHEMA_VERSION = SCHEMA_VERSION;
-exports.createAppDefinition = createAppDefinition;
-exports.defineGeneratorPlugin = defineGeneratorPlugin;
-exports.isAppDefinition = isAppDefinition;
-exports.isHttpMethod = isHttpMethod;
-exports.isRpcDefinition = isRpcDefinition;
-exports.isRpcDefinitionBase = isRpcDefinitionBase;
-exports.isRpcHttpMethod = isRpcHttpMethod;
-exports.isServiceDefinition = isServiceDefinition;
 exports.normalizeWhitespace = normalizeWhitespace;
 exports.removeDisallowedChars = removeDisallowedChars;
 exports.setNestedObjectProperty = setNestedObjectProperty;
 exports.stringStartsWithNumber = stringStartsWithNumber;
 exports.unflattenObject = unflattenObject;
 exports.unflattenProcedures = unflattenProcedures;
+Object.prototype.hasOwnProperty.call(typeDefs, '__proto__') &&
+    !Object.prototype.hasOwnProperty.call(exports, '__proto__') &&
+    Object.defineProperty(exports, '__proto__', {
+        enumerable: true,
+        value: typeDefs['__proto__']
+    });
+
+Object.keys(typeDefs).forEach(function (k) {
+    if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = typeDefs[k];
+});
+Object.prototype.hasOwnProperty.call(scule, '__proto__') &&
+    !Object.prototype.hasOwnProperty.call(exports, '__proto__') &&
+    Object.defineProperty(exports, '__proto__', {
+        enumerable: true,
+        value: scule['__proto__']
+    });
+
 Object.keys(scule).forEach(function (k) {
     if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = scule[k];
 });
-Object.keys(jtdUtils).forEach(function (k) {
-    if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = jtdUtils[k];
-});

package/dist/index.d.cts

@@ -1,72 +1,12 @@
-import { Schema, SchemaFormProperties, SchemaFormDiscriminator } from 'jtd-utils';
-export * from 'jtd-utils';
+import { AppDefinition, RpcDefinition, ServiceDefinition } from '@arrirpc/type-defs';
+export * from '@arrirpc/type-defs';
 export * from 'scule';
 
-declare const HttpMethodValues: readonly ["get", "post", "put", "patch", "delete", "head"];
-type HttpMethod = (typeof HttpMethodValues)[number];
-type RpcHttpMethod = Exclude<HttpMethod, "head">;
-declare const isHttpMethod: (input: any) => input is HttpMethod;
-declare const isRpcHttpMethod: (input: any) => input is RpcHttpMethod;
-declare const SCHEMA_VERSION = "0.0.7";
-interface AppDefinition {
-    schemaVersion: typeof SCHEMA_VERSION;
-    info?: {
-        title?: string;
-        description?: string;
-        version?: string;
-        [key: string]: string | undefined;
-    };
-    externalDocs?: {
-        description?: string;
-        url: string;
-    };
-    procedures: Record<string, RpcDefinition<string>>;
-    definitions: Record<string, Schema>;
-}
-declare function isAppDefinition(input: unknown): input is AppDefinition;
-interface RpcDefinitionBase<T = string> {
-    path: string;
-    params?: T;
-    response?: T;
-    description?: string;
-    isDeprecated?: boolean;
-}
-interface HttpRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: "http";
-    method: RpcHttpMethod;
-    isEventStream?: boolean;
-}
-interface WsRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: "ws";
-}
-interface CustomRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: `custom:${string}`;
-    [key: string]: unknown;
-}
-type RpcDefinition<T = string> = HttpRpcDefinition<T> | WsRpcDefinition<T> | CustomRpcDefinition<T>;
-declare function isRpcDefinitionBase(input: unknown): input is RpcDefinitionBase;
-declare function isRpcDefinition(input: unknown): input is RpcDefinition;
-interface ServiceDefinition {
-    [key: string]: RpcDefinition | ServiceDefinition;
-}
-declare function isServiceDefinition(input: any): input is ServiceDefinition;
 declare function unflattenProcedures(procedures: AppDefinition["procedures"]): Record<string, RpcDefinition | ServiceDefinition>;
 declare function unflattenObject(data: Record<string, any>): any;
 declare const removeDisallowedChars: (input: string, disallowedChars: string) => string;
 declare const stringStartsWithNumber: (input: string) => boolean;
 declare function setNestedObjectProperty<T>(targetProp: string, value: T, object: Record<any, any>): Record<any, any>;
 declare function normalizeWhitespace(input: string): string;
-interface Generator<TOptions extends Record<string, any> | undefined> {
-    run: (def: AppDefinition, isDevServer?: boolean) => any;
-    options: TOptions;
-}
-type GeneratorPlugin<TOptions extends Record<string, any> | undefined> = (options: TOptions) => Generator<TOptions>;
-declare function defineGeneratorPlugin<TOptions extends Record<string, any> | undefined>(plugin: GeneratorPlugin<TOptions>): GeneratorPlugin<TOptions>;
-type RpcDefinitionHelper = RpcDefinition<SchemaFormProperties | SchemaFormDiscriminator>;
-type AppDefinitionHelper = Omit<AppDefinition, "procedures" | "definitions" | "schemaVersion"> & {
-    procedures: Record<string, RpcDefinitionHelper>;
-    definitions?: AppDefinition["definitions"];
-};
-declare function createAppDefinition(input: AppDefinitionHelper): AppDefinition;
 
-export { type AppDefinition, type CustomRpcDefinition, type Generator, type GeneratorPlugin, type HttpMethod, HttpMethodValues, type HttpRpcDefinition, type RpcDefinition, type RpcDefinitionBase, type RpcHttpMethod, SCHEMA_VERSION, type ServiceDefinition, type WsRpcDefinition, createAppDefinition, defineGeneratorPlugin, isAppDefinition, isHttpMethod, isRpcDefinition, isRpcDefinitionBase, isRpcHttpMethod, isServiceDefinition, normalizeWhitespace, removeDisallowedChars, setNestedObjectProperty, stringStartsWithNumber, unflattenObject, unflattenProcedures };
+export { normalizeWhitespace, removeDisallowedChars, setNestedObjectProperty, stringStartsWithNumber, unflattenObject, unflattenProcedures };

package/dist/index.d.mts

@@ -1,72 +1,12 @@
-import { Schema, SchemaFormProperties, SchemaFormDiscriminator } from 'jtd-utils';
-export * from 'jtd-utils';
+import { AppDefinition, RpcDefinition, ServiceDefinition } from '@arrirpc/type-defs';
+export * from '@arrirpc/type-defs';
 export * from 'scule';
 
-declare const HttpMethodValues: readonly ["get", "post", "put", "patch", "delete", "head"];
-type HttpMethod = (typeof HttpMethodValues)[number];
-type RpcHttpMethod = Exclude<HttpMethod, "head">;
-declare const isHttpMethod: (input: any) => input is HttpMethod;
-declare const isRpcHttpMethod: (input: any) => input is RpcHttpMethod;
-declare const SCHEMA_VERSION = "0.0.7";
-interface AppDefinition {
-    schemaVersion: typeof SCHEMA_VERSION;
-    info?: {
-        title?: string;
-        description?: string;
-        version?: string;
-        [key: string]: string | undefined;
-    };
-    externalDocs?: {
-        description?: string;
-        url: string;
-    };
-    procedures: Record<string, RpcDefinition<string>>;
-    definitions: Record<string, Schema>;
-}
-declare function isAppDefinition(input: unknown): input is AppDefinition;
-interface RpcDefinitionBase<T = string> {
-    path: string;
-    params?: T;
-    response?: T;
-    description?: string;
-    isDeprecated?: boolean;
-}
-interface HttpRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: "http";
-    method: RpcHttpMethod;
-    isEventStream?: boolean;
-}
-interface WsRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: "ws";
-}
-interface CustomRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: `custom:${string}`;
-    [key: string]: unknown;
-}
-type RpcDefinition<T = string> = HttpRpcDefinition<T> | WsRpcDefinition<T> | CustomRpcDefinition<T>;
-declare function isRpcDefinitionBase(input: unknown): input is RpcDefinitionBase;
-declare function isRpcDefinition(input: unknown): input is RpcDefinition;
-interface ServiceDefinition {
-    [key: string]: RpcDefinition | ServiceDefinition;
-}
-declare function isServiceDefinition(input: any): input is ServiceDefinition;
 declare function unflattenProcedures(procedures: AppDefinition["procedures"]): Record<string, RpcDefinition | ServiceDefinition>;
 declare function unflattenObject(data: Record<string, any>): any;
 declare const removeDisallowedChars: (input: string, disallowedChars: string) => string;
 declare const stringStartsWithNumber: (input: string) => boolean;
 declare function setNestedObjectProperty<T>(targetProp: string, value: T, object: Record<any, any>): Record<any, any>;
 declare function normalizeWhitespace(input: string): string;
-interface Generator<TOptions extends Record<string, any> | undefined> {
-    run: (def: AppDefinition, isDevServer?: boolean) => any;
-    options: TOptions;
-}
-type GeneratorPlugin<TOptions extends Record<string, any> | undefined> = (options: TOptions) => Generator<TOptions>;
-declare function defineGeneratorPlugin<TOptions extends Record<string, any> | undefined>(plugin: GeneratorPlugin<TOptions>): GeneratorPlugin<TOptions>;
-type RpcDefinitionHelper = RpcDefinition<SchemaFormProperties | SchemaFormDiscriminator>;
-type AppDefinitionHelper = Omit<AppDefinition, "procedures" | "definitions" | "schemaVersion"> & {
-    procedures: Record<string, RpcDefinitionHelper>;
-    definitions?: AppDefinition["definitions"];
-};
-declare function createAppDefinition(input: AppDefinitionHelper): AppDefinition;
 
-export { type AppDefinition, type CustomRpcDefinition, type Generator, type GeneratorPlugin, type HttpMethod, HttpMethodValues, type HttpRpcDefinition, type RpcDefinition, type RpcDefinitionBase, type RpcHttpMethod, SCHEMA_VERSION, type ServiceDefinition, type WsRpcDefinition, createAppDefinition, defineGeneratorPlugin, isAppDefinition, isHttpMethod, isRpcDefinition, isRpcDefinitionBase, isRpcHttpMethod, isServiceDefinition, normalizeWhitespace, removeDisallowedChars, setNestedObjectProperty, stringStartsWithNumber, unflattenObject, unflattenProcedures };
+export { normalizeWhitespace, removeDisallowedChars, setNestedObjectProperty, stringStartsWithNumber, unflattenObject, unflattenProcedures };

package/dist/index.d.ts

@@ -1,72 +1,12 @@
-import { Schema, SchemaFormProperties, SchemaFormDiscriminator } from 'jtd-utils';
-export * from 'jtd-utils';
+import { AppDefinition, RpcDefinition, ServiceDefinition } from '@arrirpc/type-defs';
+export * from '@arrirpc/type-defs';
 export * from 'scule';
 
-declare const HttpMethodValues: readonly ["get", "post", "put", "patch", "delete", "head"];
-type HttpMethod = (typeof HttpMethodValues)[number];
-type RpcHttpMethod = Exclude<HttpMethod, "head">;
-declare const isHttpMethod: (input: any) => input is HttpMethod;
-declare const isRpcHttpMethod: (input: any) => input is RpcHttpMethod;
-declare const SCHEMA_VERSION = "0.0.7";
-interface AppDefinition {
-    schemaVersion: typeof SCHEMA_VERSION;
-    info?: {
-        title?: string;
-        description?: string;
-        version?: string;
-        [key: string]: string | undefined;
-    };
-    externalDocs?: {
-        description?: string;
-        url: string;
-    };
-    procedures: Record<string, RpcDefinition<string>>;
-    definitions: Record<string, Schema>;
-}
-declare function isAppDefinition(input: unknown): input is AppDefinition;
-interface RpcDefinitionBase<T = string> {
-    path: string;
-    params?: T;
-    response?: T;
-    description?: string;
-    isDeprecated?: boolean;
-}
-interface HttpRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: "http";
-    method: RpcHttpMethod;
-    isEventStream?: boolean;
-}
-interface WsRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: "ws";
-}
-interface CustomRpcDefinition<T = string> extends RpcDefinitionBase<T> {
-    transport: `custom:${string}`;
-    [key: string]: unknown;
-}
-type RpcDefinition<T = string> = HttpRpcDefinition<T> | WsRpcDefinition<T> | CustomRpcDefinition<T>;
-declare function isRpcDefinitionBase(input: unknown): input is RpcDefinitionBase;
-declare function isRpcDefinition(input: unknown): input is RpcDefinition;
-interface ServiceDefinition {
-    [key: string]: RpcDefinition | ServiceDefinition;
-}
-declare function isServiceDefinition(input: any): input is ServiceDefinition;
 declare function unflattenProcedures(procedures: AppDefinition["procedures"]): Record<string, RpcDefinition | ServiceDefinition>;
 declare function unflattenObject(data: Record<string, any>): any;
 declare const removeDisallowedChars: (input: string, disallowedChars: string) => string;
 declare const stringStartsWithNumber: (input: string) => boolean;
 declare function setNestedObjectProperty<T>(targetProp: string, value: T, object: Record<any, any>): Record<any, any>;
 declare function normalizeWhitespace(input: string): string;
-interface Generator<TOptions extends Record<string, any> | undefined> {
-    run: (def: AppDefinition, isDevServer?: boolean) => any;
-    options: TOptions;
-}
-type GeneratorPlugin<TOptions extends Record<string, any> | undefined> = (options: TOptions) => Generator<TOptions>;
-declare function defineGeneratorPlugin<TOptions extends Record<string, any> | undefined>(plugin: GeneratorPlugin<TOptions>): GeneratorPlugin<TOptions>;
-type RpcDefinitionHelper = RpcDefinition<SchemaFormProperties | SchemaFormDiscriminator>;
-type AppDefinitionHelper = Omit<AppDefinition, "procedures" | "definitions" | "schemaVersion"> & {
-    procedures: Record<string, RpcDefinitionHelper>;
-    definitions?: AppDefinition["definitions"];
-};
-declare function createAppDefinition(input: AppDefinitionHelper): AppDefinition;
 
-export { type AppDefinition, type CustomRpcDefinition, type Generator, type GeneratorPlugin, type HttpMethod, HttpMethodValues, type HttpRpcDefinition, type RpcDefinition, type RpcDefinitionBase, type RpcHttpMethod, SCHEMA_VERSION, type ServiceDefinition, type WsRpcDefinition, createAppDefinition, defineGeneratorPlugin, isAppDefinition, isHttpMethod, isRpcDefinition, isRpcDefinitionBase, isRpcHttpMethod, isServiceDefinition, normalizeWhitespace, removeDisallowedChars, setNestedObjectProperty, stringStartsWithNumber, unflattenObject, unflattenProcedures };
+export { normalizeWhitespace, removeDisallowedChars, setNestedObjectProperty, stringStartsWithNumber, unflattenObject, unflattenProcedures };

package/dist/index.mjs

@@ -1,88 +1,11 @@
-import { pascalCase } from 'scule';
+export * from '@arrirpc/type-defs';
 export * from 'scule';
-export * from 'jtd-utils';
 
-const HttpMethodValues = [
-  "get",
-  "post",
-  "put",
-  "patch",
-  "delete",
-  "head"
-];
-const isHttpMethod = (input) => {
-  if (typeof input !== "string") {
-    return false;
-  }
-  return HttpMethodValues.includes(input);
-};
-const isRpcHttpMethod = (input) => {
-  return isHttpMethod(input) && input !== "head";
-};
-const SCHEMA_VERSION = "0.0.7";
-function isAppDefinition(input) {
-  if (typeof input !== "object") {
-    return false;
-  }
-  const inputObj = input;
-  if (typeof inputObj.schemaVersion !== "string") {
-    return false;
-  }
-  if (typeof inputObj.procedures !== "object") {
-    return false;
-  }
-  if (typeof inputObj.definitions !== "object") {
-    return false;
-  }
-  return true;
-}
-function isRpcDefinitionBase(input) {
-  if (typeof input !== "object" || input === null) {
-    return false;
-  }
-  if ("params" in input && typeof input.params !== "undefined" && typeof input.params !== "string") {
-    return false;
-  }
-  if ("response" in input && typeof input.response !== "undefined" && typeof input.response !== "string") {
-    return false;
-  }
-  return "transport" in input && typeof input.transport === "string" && input.transport.length > 0 && "path" in input && typeof input.path === "string" && input.path.length > 0;
-}
-function isRpcDefinition(input) {
-  if (!isRpcDefinitionBase(input)) {
-    return false;
-  }
-  if (!("transport" in input) || typeof input.transport !== "string") {
-    return false;
-  }
-  if (input.transport === "http") {
-    return "method" in input && isRpcHttpMethod(input.method);
-  }
-  if (input.transport === "ws") {
-    return true;
-  }
-  if (input.transport.startsWith("custom:")) {
-    return true;
-  }
-  return false;
-}
-function isServiceDefinition(input) {
-  if (typeof input !== "object") {
-    return false;
-  }
-  for (const key of Object.keys(input)) {
-    if (typeof input[key] !== "object") {
-      return false;
-    }
-  }
-  return true;
-}
 function unflattenProcedures(procedures) {
   return unflattenObject(procedures);
 }
 function unflattenObject(data) {
-  if (Object(data) !== data || Array.isArray(data))
-    return data;
+  if (Object(data) !== data || Array.isArray(data)) return data;
   const regex = /\.?([^.[\]]+)|\[(\d+)\]/g;
   const result = {};
   for (const p in data) {
@@ -137,39 +60,5 @@ function normalizeWhitespace(input) {
   }
   return result;
 }
-function defineGeneratorPlugin(plugin) {
-  return plugin;
-}
-function createAppDefinition(input) {
-  const definitions = { ...input.definitions };
-  const procedures = {};
-  for (const key of Object.keys(input.procedures)) {
-    const def = input.procedures[key];
-    let paramName;
-    if (def.params) {
-      paramName = def.params.metadata?.id ?? pascalCase(`${key.split(".").join("_")}Params`);
-      definitions[paramName] = def.params;
-    }
-    let responseName;
-    if (def.response) {
-      responseName = def.response.metadata?.id ?? pascalCase(`${key.split(".").join("_")}Response`);
-      definitions[responseName] = def.response;
-    }
-    delete def.params;
-    delete def.response;
-    procedures[key] = {
-      ...def,
-      params: paramName,
-      response: responseName
-    };
-  }
-  const result = {
-    schemaVersion: "0.0.7",
-    ...input,
-    procedures,
-    definitions
-  };
-  return result;
-}
 
-export { HttpMethodValues, SCHEMA_VERSION, createAppDefinition, defineGeneratorPlugin, isAppDefinition, isHttpMethod, isRpcDefinition, isRpcDefinitionBase, isRpcHttpMethod, isServiceDefinition, normalizeWhitespace, removeDisallowedChars, setNestedObjectProperty, stringStartsWithNumber, unflattenObject, unflattenProcedures };
+export { normalizeWhitespace, removeDisallowedChars, setNestedObjectProperty, stringStartsWithNumber, unflattenObject, unflattenProcedures };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/codegen-utils",
-  "version": "0.69.1",
+  "version": "0.70.1",
   "license": "MIT",
   "author": {
     "name": "joshmossas",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "scule": "^1.3.0",
-    "jtd-utils": "0.69.1"
+    "@arrirpc/type-defs": "0.70.1"
   },
   "devDependencies": {}
 }