quickbase-js 1.1.0-beta.4 → 1.1.0-beta.5

package/{src/code-generation → open-api}/fix-spec-main.ts

@@ -166,7 +166,7 @@ async function fixQuickBaseSpec(): Promise<void> {
     console.log(`Writing fixed spec to ${path.basename(outputFile)}...`);
     await fs.mkdir(OUTPUT_DIR, { recursive: true });
     await fs.writeFile(outputFile, JSON.stringify(spec, null, 2), "utf8");
-    console.log("Spec fixed successfully!");
+    console.log("Spec fixed successfully! Output written to:", outputFile);
   } catch (error) {
     console.error("Failed to fix spec:", error);
     process.exit(1);

package/{src/code-generation → open-api}/generate-unified-interface.ts

@@ -1,15 +1,21 @@
-// src/code-generation/generate-unified-interface.ts
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
-import { simplifyName } from "../utils.ts";
 import { OpenAPIV2 } from "openapi-types";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const SPEC_FILE = join(__dirname, "output", "quickbase-fixed.json");
-const OUTPUT_DIR = join(__dirname, "..", "generated-unified");
+const SPEC_FILE = join(__dirname, "output", "quickbase-fixed.json"); // Remains relative to open-api/
+const OUTPUT_DIR = join(__dirname, "..", "src", "generated-unified"); // Updated to src/generated-unified/
 const OUTPUT_FILE = join(OUTPUT_DIR, "QuickbaseClient.ts");
 
+// Placeholder for simplifyName (since utils.ts is missing)
+function simplifyName(name: string): string {
+  return name
+    .replace(/ById$/, "")
+    .replace(/Api$/, "")
+    .replace(/^(\w)/, (_, c) => c.toLowerCase());
+}
+
 function generateInterface() {
   if (!existsSync(SPEC_FILE)) {
     console.error(
@@ -38,7 +44,7 @@ function generateInterface() {
       const op = operation as OpenAPIV2.OperationObject | undefined;
       if (!op || !op.operationId) continue;
 
-      const opId = op.operationId;
+      const opId = simplifyName(op.operationId);
       const params = (op.parameters || [])
         .filter((p) => {
           const param = p as OpenAPIV2.ParameterObject;
@@ -96,8 +102,13 @@ function generateInterface() {
   console.log(`Generated ${OUTPUT_FILE}`);
 }
 
-function mapOpenApiTypeToTs(openApiType: string): string {
-  switch (openApiType.toLowerCase()) {
+function mapOpenApiTypeToTs(
+  openApiType: string | string[] | undefined
+): string {
+  const type = Array.isArray(openApiType)
+    ? openApiType[0]
+    : openApiType || "any";
+  switch (type.toLowerCase()) {
     case "integer":
     case "int":
       return "number";
@@ -111,30 +122,44 @@ function mapOpenApiTypeToTs(openApiType: string): string {
 }
 
 function mapRefToType(
-  schema: OpenAPIV2.SchemaObject | OpenAPIV2.ReferenceObject,
+  schema: OpenAPIV2.SchemaObject | OpenAPIV2.ReferenceObject | undefined,
   modelImports: Set<string>
 ): string {
-  if ("$ref" in schema) {
+  if (!schema) return "any";
+
+  if ("$ref" in schema && schema.$ref) {
     const model = schema.$ref.split("/").pop()!;
     modelImports.add(model);
     return model;
   }
+
   if (schema.type === "array" && schema.items) {
     const itemType =
-      "$ref" in schema.items
+      "$ref" in schema.items && schema.items.$ref
         ? schema.items.$ref.split("/").pop()!
-        : mapOpenApiTypeToTs(schema.items.type || "any");
-    if ("$ref" in schema.items) modelImports.add(itemType);
+        : mapOpenApiTypeToTs(schema.items.type);
+    if ("$ref" in schema.items && schema.items.$ref) modelImports.add(itemType);
     return `${itemType}[]`;
   }
+
   if (schema.type === "object" && schema.additionalProperties) {
-    const valueType = schema.additionalProperties.$ref
-      ? schema.additionalProperties.$ref.split("/").pop()!
-      : mapOpenApiTypeToTs(schema.additionalProperties.type || "any");
-    if (schema.additionalProperties.$ref) modelImports.add(valueType);
+    const additionalProps = schema.additionalProperties as
+      | OpenAPIV2.SchemaObject
+      | OpenAPIV2.ReferenceObject
+      | boolean;
+    if (typeof additionalProps === "boolean") {
+      return "{ [key: string]: any }";
+    }
+    const valueType =
+      "$ref" in additionalProps && additionalProps.$ref
+        ? additionalProps.$ref.split("/").pop()!
+        : mapOpenApiTypeToTs(additionalProps.type);
+    if ("$ref" in additionalProps && additionalProps.$ref)
+      modelImports.add(valueType);
     return `{ [key: string]: ${valueType} }`;
   }
-  return mapOpenApiTypeToTs(schema.type || "any");
+
+  return mapOpenApiTypeToTs(schema.type);
 }
 
 try {

package/{src/code-generation → open-api}/regenerate-client.ts

@@ -9,10 +9,10 @@ import readline from "readline";
 const CURRENT_JAR_VERSION = "7.12.0";
 const MAVEN_METADATA_URL =
   "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/maven-metadata.xml";
-const CODEGEN_DIR = join(fileURLToPath(import.meta.url), "..");
-const JARS_DIR = join(CODEGEN_DIR, "..", "openapi-jars");
-const SPEC_INPUT = join(CODEGEN_DIR, "output", "quickbase-fixed.json"); // Updated path
-const OUTPUT_DIR = join(CODEGEN_DIR, "..", "generated");
+const CODEGEN_DIR = join(fileURLToPath(import.meta.url), ".."); // open-api/
+const JARS_DIR = join(CODEGEN_DIR, "..", "tools", "openapi-jars"); // Updated to tools/openapi-jars/
+const SPEC_INPUT = join(CODEGEN_DIR, "output", "quickbase-fixed.json"); // Relative to open-api/
+const OUTPUT_DIR = join(CODEGEN_DIR, "..", "src", "generated"); // Up to root, then into src/generated/
 
 async function getLatestVersion(): Promise<string> {
   const response = await fetch(MAVEN_METADATA_URL);

package/package.json

@@ -1,18 +1,26 @@
 {
   "name": "quickbase-js",
-  "main": "dist/quickbase.js",
-  "types": "dist/quickbase.d.ts",
-  "version": "1.1.0-beta.4",
+  "version": "1.1.0-beta.5",
+  "description": "QuickBase JavaScript client for frameworks and vanilla JS",
+  "type": "module",
+  "main": "dist/esm/quickbase.js",
+  "module": "dist/esm/quickbase.js",
+  "types": "dist/esm/quickbase.d.ts",
   "publishConfig": {
     "access": "public"
   },
-  "description": "QuickBase JavaScript client for frameworks and vanilla JS",
-  "module": "dist/quickbase.js",
-  "type": "module",
   "exports": {
     ".": {
-      "import": "./dist/quickbase.js",
-      "types": "./dist/quickbase.d.ts"
+      "import": {
+        "minified": "./dist/esm/quickbase.min.js",
+        "default": "./dist/esm/quickbase.js"
+      },
+      "require": {
+        "minified": "./dist/umd/quickbase.umd.min.js",
+        "default": "./dist/umd/quickbase.umd.js"
+      },
+      "types": "./dist/esm/quickbase.d.ts",
+      "umd:types": "./dist/umd/quickbase.umd.d.ts"
     }
   },
   "scripts": {
@@ -21,13 +29,14 @@
     "release:alpha": "standard-version --prerelease alpha",
     "release:push": "npm run release:beta && git push --follow-tags origin main",
     "release:publish": "npm run release:push && npm publish --tag beta",
-    "fix-spec": "node --loader ts-node/esm src/code-generation/fix-spec-main.ts",
-    "regenerate:openapi": "rimraf src/generated && node --loader ts-node/esm src/code-generation/regenerate-client.ts",
-    "regenerate:unified": "node --loader ts-node/esm src/code-generation/generate-unified-interface.ts",
+    "release:stable": "standard-version && git push --follow-tags origin main && npm publish",
+    "fix-spec": "node --loader ts-node/esm open-api/fix-spec-main.ts",
+    "regenerate:openapi": "rimraf src/generated && node --loader ts-node/esm open-api/regenerate-client.ts",
+    "regenerate:unified": "node --loader ts-node/esm open-api/generate-unified-interface.ts",
     "regenerate:all": "npm run fix-spec && npm run regenerate:openapi && npm run regenerate:unified",
-    "log-gen": "node --loader ts-node/esm src/log-gen.ts",
-    "build": "rimraf dist && rollup -c",
-    "build:prod": "rm -rf dist/* && NODE_ENV=production rollup -c",
+    "log-gen": "node --loader ts-node/esm tools/log-gen.ts",
+    "build": "rimraf dist && node --loader ts-node/esm build.js",
+    "build:prod": "rimraf dist && NODE_ENV=production node --loader ts-node/esm build.js",
     "test:all": "vitest run tests/vitest/**/**/*.test.ts --reporter=basic && playwright test tests/playwright/qb --config playwright.config.ts --reporter=dot --quiet",
     "test:pw:qb:all": "playwright test tests/playwright/qb --config playwright.config.ts",
     "test:vitest:all": "vitest run tests/vitest/**/**/*.test.ts",
@@ -55,6 +64,7 @@
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.13.10",
     "dotenv": "^16.4.7",
     "glob": "^11.0.1",
@@ -69,6 +79,7 @@
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
+    "undici-types": "^7.5.0",
     "vitest": "^3.0.8"
   }
 }

package/rollup.config.mjs

@@ -0,0 +1,114 @@
+import terser from "@rollup/plugin-terser";
+import nodeResolve from "@rollup/plugin-node-resolve";
+import commonjs from "@rollup/plugin-commonjs";
+import dts from "rollup-plugin-dts";
+import typescript from "@rollup/plugin-typescript";
+
+const isProd = process.env.NODE_ENV === "production";
+
+// External dependencies for both ESM and UMD builds
+const external = [
+  "node:http",
+  "node:https",
+  "node:zlib",
+  "node:stream",
+  "node:buffer",
+  "node:util",
+  "node:url",
+  "node:net",
+  "node:fs",
+  "node:path",
+  "node-fetch",
+];
+
+// Global mappings for UMD (browser) build
+const globals = {
+  "node-fetch": "fetch", // Map node-fetch to window.fetch in browsers
+};
+
+export default [
+  // ESM Build
+  {
+    input: "src/quickbaseClient.ts",
+    output: {
+      dir: "dist/esm",
+      format: "esm",
+      sourcemap: true,
+      entryFileNames: "quickbase.js",
+    },
+    external,
+    plugins: [
+      nodeResolve({ preferBuiltins: true }), // Node.js resolution
+      commonjs(), // Convert CommonJS to ESM
+      typescript({
+        tsconfig: "./tsconfig.json",
+        noEmitOnError: true, // Fail on TypeScript errors
+        // Use Rollup to emit JavaScript, overriding noEmit for this build
+      }),
+      isProd && terser(), // Minification for production
+    ],
+  },
+  // UMD Build
+  {
+    input: "src/quickbaseClient.ts",
+    output: {
+      file: "dist/umd/quickbase.umd.js",
+      format: "umd",
+      name: "QuickbaseJS", // Global name for browser
+      sourcemap: true,
+      globals,
+    },
+    external,
+    plugins: [
+      nodeResolve({ preferBuiltins: true, browser: true }), // Browser-first resolution
+      commonjs(), // Convert CommonJS to UMD
+      typescript({
+        tsconfig: "./tsconfig.json",
+        noEmitOnError: true, // Fail on TypeScript errors
+        // Use Rollup to emit JavaScript, overriding noEmit for this build
+      }),
+      isProd && terser(), // Minification for production
+    ],
+  },
+  // ESM Declarations
+  {
+    input: "src/quickbaseClient.ts",
+    output: {
+      file: "dist/esm/quickbase.d.ts",
+      format: "esm",
+    },
+    plugins: [
+      dts({
+        tsconfig: "./tsconfig.json",
+        respectExternal: true, // Include external dependencies in declarations
+      }),
+    ],
+  },
+  // UMD Declarations
+  {
+    input: "src/quickbaseClient.ts",
+    output: {
+      file: "dist/umd/quickbase.umd.d.ts",
+      format: "umd",
+    },
+    plugins: [
+      dts({
+        tsconfig: "./tsconfig.json",
+        respectExternal: true, // Include external dependencies in declarations
+      }),
+    ],
+  },
+].map((config) => ({
+  ...config,
+  onwarn(warning, warn) {
+    // Suppress TypeScript plugin warnings
+    if (
+      warning.code === "PLUGIN_WARNING" &&
+      warning.plugin === "typescript" &&
+      warning.message.includes("TS5096")
+    ) {
+      return;
+    }
+    warn(warning);
+  },
+}));

package/src/generated-unified/QuickbaseClient.ts

@@ -1,4 +1,4 @@
-// Generated on 2025-03-12T04:58:24.127Z
+// Generated on 2025-03-12T19:20:50.952Z
 import { App, CopyApp200Response, CopyAppRequest, CreateApp200Response, CreateAppRequest, CreateField200Response, CreateFieldRequest, DeleteApp200Response, DeleteAppRequest, DeleteFields200Response, DeleteFieldsRequest, DeleteRecords200Response, DeleteRecordsRequest, DeleteTableResponse, Field, FieldUsage, GetRelationships200Response, GetTempTokenDBID200Response, ReportRunResponse, RunQueryRequest, RunQueryResponse, Table, UpdateTableRequest, Upsert200Response, Upsert207Response, UpsertRequest } from "../generated/models";
 
 export interface QuickbaseClient {

package/test-artifacts/.last-run.json

@@ -1,4 +1,6 @@
 {
-  "status": "passed",
-  "failedTests": []
+  "status": "failed",
+  "failedTests": [
+    "07fa1d68e36f7ff08da6-e567a262e6a662a8edf4"
+  ]
 }

package/test-esm.js

@@ -0,0 +1 @@
+import { quickbase } from './dist/esm/quickbase.js'; const qb = quickbase({ realm: 'example', userToken: 'your-token' }); console.log(qb);

package/test-umd.js

@@ -0,0 +1 @@
+const quickbase = require('./dist/umd/quickbase.umd.js'); const qb = quickbase({ realm: 'example', userToken: 'your-token' }); console.log(qb);

package/test.ts

@@ -0,0 +1 @@
+console.log('Hello from TypeScript');

package/tests/playwright/qb/auth/umd.test.ts

@@ -0,0 +1,10 @@
+// tests/playwright/qb/auth/umd.test.ts
+import { test, expect } from "@playwright/test";
+test("UMD build works in browser", async ({ page }) => {
+  await page.goto("http://localhost:3000/test-umd.html");
+  const result = await page.evaluate(() => {
+    const qb = new QuickbaseJS({ realm: "example", useTempTokens: true });
+    return qb.getTempTokenDBID({ dbid: "test-dbid" });
+  });
+  expect(result).toBeTruthy();
+});

package/tests/vitest/unit/umd.test.ts

@@ -0,0 +1,8 @@
+// tests/vitest/unit/umd.test.ts
+import { test, expect } from "vitest";
+const quickbaseUMD = require("../../dist/umd/quickbase.umd.js");
+const { quickbase: quickbaseESM } = await import("../../dist/esm/quickbase.js");
+test("UMD and ESM builds work in Node.js", () => {
+  expect(quickbaseUMD).toBeDefined();
+  expect(quickbaseESM).toBeDefined();
+});

package/{src → tools}/log-gen.ts

@@ -12,28 +12,30 @@ const excludeDirs: string[] = ["node_modules", ".git", "specs"];
 
 // prettier-ignore
 const includeFolders: string[] = [
-  // "src/code-generation",
-  // "src/code-generation/definitions",
-  // "src/code-generation/paths",
+  "open-api",
+  "open-api/definitions",
+  "open-api/paths",
 ];
 
 // prettier-ignore
 const includeRecursiveFolders: string[] = [
-  "tests",
-  "tests/vitest/unit",
-  "tests/vitest/qb"
+  // "tests",
+  // "tests/vitest/unit",
+  // "tests/vitest/qb"
 ];
 
 // prettier-ignore
 const includeFiles: string[] = [
-  // "package.json",
-  // "tsconfig.json",
-  // "rollup.config.js",
-  // "vitest.config.ts",
-  // "src/utils.ts",
-  // "src/tokenCache.ts",
-  // "src/generated-unified/QuickbaseClient.ts",
-  // "src/quickbaseClient.ts",
+  "package.json",
+  "tsconfig.json",
+  "tsconfig.build.json",
+  "rollup.config.js",
+  "vitest.config.ts",
+  "build.js",
+  "src/utils.ts",
+  "src/tokenCache.ts",
+  "src/generated-unified/QuickbaseClient.ts",
+  "src/quickbaseClient.ts",
 ];
 
 const projectGoals: string[] = [

package/tsconfig.build.json

@@ -0,0 +1,17 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist/temp",
+    "noEmit": false,
+    "allowImportingTsExtensions": false,
+    "declaration": false,
+    "sourceMap": true
+  },
+  "include": ["dist/temp-src/**/*"],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "tests/**/*",
+    "src/**/*" // Exclude original src/ to avoid confusion
+  ]
+}

package/tsconfig.json

@@ -5,7 +5,7 @@
     "moduleResolution": "bundler",
     "strict": true,
     "lib": ["ES2015", "ESNext", "DOM"],
-    "types": ["node", "playwright/test"],
+    "types": ["node", "playwright/test", "undici-types"],
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "allowImportingTsExtensions": true,
@@ -16,12 +16,12 @@
     "sourceMap": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"],      // Matches Vite's @ -> src/
-      "@tests/*": ["tests/*"] // Matches Vite's @tests -> tests/
+      "@/*": ["src/*"],
+      "@tests/*": ["tests/*"]
     }
   },
-  "include": ["src/**/*", "tests/**/*"],
-  "exclude": ["node_modules", "dist", "src/generated-old"],
+  "include": ["src/**/*", "tests/**/*", "open-api/**/*", "tools/**/*"],
+  "exclude": ["node_modules", "dist", "specs"],
   "ts-node": {
     "esm": true,
     "transpileOnly": true