airtable-ts-codegen 2.0.0 → 2.0.1

package/dist/escape/escapeIdentifier.d.ts

@@ -1,3 +1,7 @@
+/**
+ * Reset the internal state - useful for testing
+ */
+export declare function resetIdentifierState(): void;
 /**
  * Used for identifiers:
  * - If the name is already a valid JS identifier, return it unmodified.
@@ -5,6 +9,7 @@
  *   - Remove invalid characters.
  *   - Convert to PascalCase.
  *   - If the result starts with a digit, prefix with `_`.
+ *   - If duplicate, add a number suffix.
  * - Returns a default identifier if the identifier cannot be salvaged.
  */
 export declare function escapeIdentifier(name: string): string;

package/dist/escape/escapeIdentifier.js

@@ -1,9 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetIdentifierState = resetIdentifierState;
 exports.escapeIdentifier = escapeIdentifier;
 const diacritics_1 = require("diacritics");
 let invalidIdentifierCount = 0;
 const DEFAULT_IDENTIFIER = 'invalidIdentifier';
+// Track used identifiers to avoid duplicates
+const usedIdentifiers = new Set();
+/**
+ * Reset the internal state - useful for testing
+ */
+function resetIdentifierState() {
+    usedIdentifiers.clear();
+    invalidIdentifierCount = 0;
+}
 /**
  * Checks if 'str' is already a valid JavaScript identifier.
  * If yes, returns true. Otherwise false.
@@ -46,6 +56,7 @@ function toPascalCase(str) {
  *   - Remove invalid characters.
  *   - Convert to PascalCase.
  *   - If the result starts with a digit, prefix with `_`.
+ *   - If duplicate, add a number suffix.
  * - Returns a default identifier if the identifier cannot be salvaged.
  */
 function escapeIdentifier(name) {
@@ -92,5 +103,13 @@ function escapeIdentifier(name) {
             return `${DEFAULT_IDENTIFIER}${invalidIdentifierCount}`;
         }
     }
-    return pascal;
+    // Handle duplicates by adding numbers
+    let finalIdentifier = pascal;
+    let counter = 2;
+    while (usedIdentifiers.has(finalIdentifier)) {
+        finalIdentifier = `${pascal}${counter}`;
+        counter += 1;
+    }
+    usedIdentifiers.add(finalIdentifier);
+    return finalIdentifier;
 }

package/dist/index.js

@@ -18,17 +18,19 @@ const main = async (config) => {
     ].join('\n');
 };
 exports.main = main;
-const generateInterfaceEntry = ({ jsName, jsType, name, type }) => {
+const generateInterfaceEntry = ({ jsName, jsType, name, type, originalName }) => {
     if (jsType === null) {
-        return `\n  // Unsupported field ${name} of type ${type}`;
+        return `\n  // Unsupported field "${name}" of type ${type}`;
     }
-    return `\n  ${jsName}: ${jsType},`;
+    const comment = originalName !== jsName ? ` // Original field: "${originalName}"` : '';
+    return `\n  ${jsName}: ${jsType},${comment}`;
 };
-const generateMappingEntry = ({ jsName, id, jsType, name }) => {
+const generateMappingEntry = ({ jsName, id, jsType, name, originalName }) => {
     if (jsType === null) {
-        return `\n    // Unsupported field ${name}: ${(0, escapeString_1.escapeString)(id)}`;
+        return `\n    // Unsupported field "${name}": ${(0, escapeString_1.escapeString)(id)}`;
     }
-    return `\n    ${jsName}: '${(0, escapeString_1.escapeString)(id)}',`;
+    const comment = originalName !== jsName ? ` // Original field: "${originalName}"` : '';
+    return `\n    ${jsName}: '${(0, escapeString_1.escapeString)(id)}',${comment}`;
 };
 const generateSchemaEntry = ({ jsName, jsType }) => {
     if (jsType === null) {
@@ -37,11 +39,13 @@ const generateSchemaEntry = ({ jsName, jsType }) => {
     return `\n    ${jsName}: '${(0, escapeString_1.escapeString)(jsType)}',`;
 };
 const generateCode = (config, tableSchema) => {
+    (0, escapeIdentifier_1.resetIdentifierState)();
     const itemNameRaw = (0, escapeIdentifier_1.escapeIdentifier)((0, recase_1.recase)(null, 'pascal', tableSchema.name));
     const itemName = /.s$/.test(itemNameRaw) ? itemNameRaw.slice(0, itemNameRaw.length - 1) : itemNameRaw;
     const tableName = (0, escapeIdentifier_1.escapeIdentifier)(`${(0, recase_1.recase)(null, 'camel', tableSchema.name)}Table`);
     const fields = tableSchema.fields.map((f) => ({
         ...f,
+        originalName: f.name,
         jsName: (0, escapeIdentifier_1.escapeIdentifier)((0, recase_1.recase)(null, 'camel', (0, escapeIdentifier_1.escapeIdentifier)(f.name))),
         jsType: (0, jsTypeForAirtableType_1.jsTypeForAirtableType)(f),
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airtable-ts-codegen",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Autogenerate TypeScript definitions for your Airtable base",
   "license": "MIT",
   "author": "Adam Jones (domdomegg)",