graphile-i18n 0.0.2 → 0.0.3

package/main/plugin.js

@@ -41,12 +41,18 @@ var LangPlugin = function LangPlugin(builder, options) {
     });
     var tablesWithLanguageTablesIdInfo = introspection["class"].filter(function (table) {
       return table.tags.hasOwnProperty('i18n');
-    }).map(function (table) {
-      return {
-        identifier: table.primaryKeyConstraint.keyAttributes[0].name,
-        idType: table.primaryKeyConstraint.keyAttributes[0].type.name
-      };
-    });
+    }).reduce(function (m, table) {
+      var _table$primaryKeyCons, _table$primaryKeyCons2;
+
+      if ((_table$primaryKeyCons = table.primaryKeyConstraint) !== null && _table$primaryKeyCons !== void 0 && (_table$primaryKeyCons2 = _table$primaryKeyCons.keyAttributes) !== null && _table$primaryKeyCons2 !== void 0 && _table$primaryKeyCons2[0]) {
+        m[table.tags.i18n] = {
+          identifier: table.primaryKeyConstraint.keyAttributes[0].name,
+          idType: table.primaryKeyConstraint.keyAttributes[0].type.name
+        };
+      }
+
+      return m;
+    }, {});
     var languageVariationTables = tablesWithLanguageTables.map(function (table) {
       return introspection["class"].find(function (t) {
         return t.name === table.tags.i18n && t.namespaceName === table.namespaceName;
@@ -58,11 +64,11 @@ var LangPlugin = function LangPlugin(builder, options) {
       i18nTables[table.tags.i18n] = {
         table: table.name,
         key: null,
-        // action_id
+        // fk_id
         connection: inflection.connection(inflection.tableType(table)),
         attrs: {},
         fields: {},
-        keyInfo: tablesWithLanguageTablesIdInfo[i]
+        keyInfo: tablesWithLanguageTablesIdInfo[table.tags.i18n]
       };
       tables[table.name] = table.tags.i18n;
     });
@@ -72,12 +78,22 @@ var LangPlugin = function LangPlugin(builder, options) {
       }).filter(function (c) {
         return c.foreignClass.name === i18nTables[table.name].table;
       });
-      if (foreignConstraintsThatMatter.length !== 1) throw new Error('lang table only supports one foreign key to parent table');
-      if (foreignConstraintsThatMatter[0].keyAttributes.length !== 1) throw new Error('lang table only supports one non compound foreign key to parent table');
+
+      if (foreignConstraintsThatMatter.length !== 1) {
+        // not sure why, but sometimes a version of the table appears in the introspection that doesn't have keys...
+        return;
+      }
+
+      if (foreignConstraintsThatMatter[0].keyAttributes.length !== 1) {
+        // not sure why, but sometimes a version of the table appears in the introspection that doesn't have keys...
+        return;
+      }
+
       i18nTables[table.name].key = foreignConstraintsThatMatter[0].keyAttributes[0].name;
       var _i18nTables$table$nam = i18nTables[table.name].keyInfo,
           identifier = _i18nTables$table$nam.identifier,
           idType = _i18nTables$table$nam.idType;
+      if (!identifier) return;
       table.attributes.forEach(function (attr) {
         if ([langPluginLanguageCodeColumn, identifier].includes(attr.name)) return;
 

package/module/plugin.js

@@ -16,12 +16,16 @@ export const LangPlugin = (builder, options) => {
     const introspection = build.pgIntrospectionResultsByKind;
     const inflection = build.inflection;
     const tablesWithLanguageTables = introspection.class.filter(table => table.tags.hasOwnProperty('i18n'));
-    const tablesWithLanguageTablesIdInfo = introspection.class.filter(table => table.tags.hasOwnProperty('i18n')).map(table => {
-      return {
-        identifier: table.primaryKeyConstraint.keyAttributes[0].name,
-        idType: table.primaryKeyConstraint.keyAttributes[0].type.name
-      };
-    });
+    const tablesWithLanguageTablesIdInfo = introspection.class.filter(table => table.tags.hasOwnProperty('i18n')).reduce((m, table) => {
+      if (table.primaryKeyConstraint?.keyAttributes?.[0]) {
+        m[table.tags.i18n] = {
+          identifier: table.primaryKeyConstraint.keyAttributes[0].name,
+          idType: table.primaryKeyConstraint.keyAttributes[0].type.name
+        };
+      }
+
+      return m;
+    }, {});
     const languageVariationTables = tablesWithLanguageTables.map(table => introspection.class.find(t => t.name === table.tags.i18n && t.namespaceName === table.namespaceName));
     const i18nTables = {};
     const tables = {};
@@ -29,23 +33,33 @@ export const LangPlugin = (builder, options) => {
       i18nTables[table.tags.i18n] = {
         table: table.name,
         key: null,
-        // action_id
+        // fk_id
         connection: inflection.connection(inflection.tableType(table)),
         attrs: {},
         fields: {},
-        keyInfo: tablesWithLanguageTablesIdInfo[i]
+        keyInfo: tablesWithLanguageTablesIdInfo[table.tags.i18n]
       };
       tables[table.name] = table.tags.i18n;
     });
     languageVariationTables.forEach(table => {
       const foreignConstraintsThatMatter = table.constraints.filter(c => c.type === 'f').filter(c => c.foreignClass.name === i18nTables[table.name].table);
-      if (foreignConstraintsThatMatter.length !== 1) throw new Error('lang table only supports one foreign key to parent table');
-      if (foreignConstraintsThatMatter[0].keyAttributes.length !== 1) throw new Error('lang table only supports one non compound foreign key to parent table');
+
+      if (foreignConstraintsThatMatter.length !== 1) {
+        // not sure why, but sometimes a version of the table appears in the introspection that doesn't have keys...
+        return;
+      }
+
+      if (foreignConstraintsThatMatter[0].keyAttributes.length !== 1) {
+        // not sure why, but sometimes a version of the table appears in the introspection that doesn't have keys...
+        return;
+      }
+
       i18nTables[table.name].key = foreignConstraintsThatMatter[0].keyAttributes[0].name;
       const {
         identifier,
         idType
       } = i18nTables[table.name].keyInfo;
+      if (!identifier) return;
       table.attributes.forEach(attr => {
         if ([langPluginLanguageCodeColumn, identifier].includes(attr.name)) return;
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "graphile-i18n",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Graphile i18n plugin",
-  "author": "true <true>",
+  "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/graphile-i18n#readme",
   "license": "SEE LICENSE IN LICENSE",
   "main": "main/index.js",