@loaders.gl/schema 3.1.3 → 4.0.0-alpha.5

package/dist/lib/schema/impl/schema.js

@@ -1,83 +1,92 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = require("../../utils/assert");
-/**
- * ArrowJS `Schema` API-compatible class for row-based tables (returned from `DataTable`)
- * https://loaders.gl/arrowjs/docs/api-reference/schema
- */
-class Schema {
-    constructor(fields, metadata) {
-        (0, assert_1.assert)(Array.isArray(fields));
-        checkNames(fields);
-        // For kepler fields, create arrow compatible `Fields` that have kepler fields as `metadata`
-        this.fields = fields;
-        this.metadata = metadata || new Map();
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { assert } from '../../utils/assert';
+export default class Schema {
+  constructor(fields, metadata) {
+    _defineProperty(this, "fields", void 0);
+
+    _defineProperty(this, "metadata", void 0);
+
+    assert(Array.isArray(fields));
+    checkNames(fields);
+    this.fields = fields;
+    this.metadata = metadata || new Map();
+  }
+
+  compareTo(other) {
+    if (this.metadata !== other.metadata) {
+      return false;
     }
-    // TODO - arrow only seems to compare fields, not metadata
-    compareTo(other) {
-        if (this.metadata !== other.metadata) {
-            return false;
-        }
-        if (this.fields.length !== other.fields.length) {
-            return false;
-        }
-        for (let i = 0; i < this.fields.length; ++i) {
-            if (!this.fields[i].compareTo(other.fields[i])) {
-                return false;
-            }
-        }
-        return true;
+
+    if (this.fields.length !== other.fields.length) {
+      return false;
     }
-    select(...columnNames) {
-        // Ensure column names reference valid fields
-        const nameMap = Object.create(null);
-        for (const name of columnNames) {
-            nameMap[name] = true;
-        }
-        const selectedFields = this.fields.filter((field) => nameMap[field.name]);
-        return new Schema(selectedFields, this.metadata);
+
+    for (let i = 0; i < this.fields.length; ++i) {
+      if (!this.fields[i].compareTo(other.fields[i])) {
+        return false;
+      }
     }
-    selectAt(...columnIndices) {
-        // Ensure column indices reference valid fields
-        const selectedFields = columnIndices.map((index) => this.fields[index]).filter(Boolean);
-        return new Schema(selectedFields, this.metadata);
+
+    return true;
+  }
+
+  select(...columnNames) {
+    const nameMap = Object.create(null);
+
+    for (const name of columnNames) {
+      nameMap[name] = true;
     }
-    assign(schemaOrFields) {
-        let fields;
-        let metadata = this.metadata;
-        if (schemaOrFields instanceof Schema) {
-            const otherSchema = schemaOrFields;
-            fields = otherSchema.fields;
-            metadata = mergeMaps(mergeMaps(new Map(), this.metadata), otherSchema.metadata);
-        }
-        else {
-            fields = schemaOrFields;
-        }
-        // Create a merged list of fields, overwrite fields in place, new fields at end
-        const fieldMap = Object.create(null);
-        for (const field of this.fields) {
-            fieldMap[field.name] = field;
-        }
-        for (const field of fields) {
-            fieldMap[field.name] = field;
-        }
-        const mergedFields = Object.values(fieldMap);
-        return new Schema(mergedFields, metadata);
+
+    const selectedFields = this.fields.filter(field => nameMap[field.name]);
+    return new Schema(selectedFields, this.metadata);
+  }
+
+  selectAt(...columnIndices) {
+    const selectedFields = columnIndices.map(index => this.fields[index]).filter(Boolean);
+    return new Schema(selectedFields, this.metadata);
+  }
+
+  assign(schemaOrFields) {
+    let fields;
+    let metadata = this.metadata;
+
+    if (schemaOrFields instanceof Schema) {
+      const otherSchema = schemaOrFields;
+      fields = otherSchema.fields;
+      metadata = mergeMaps(mergeMaps(new Map(), this.metadata), otherSchema.metadata);
+    } else {
+      fields = schemaOrFields;
     }
+
+    const fieldMap = Object.create(null);
+
+    for (const field of this.fields) {
+      fieldMap[field.name] = field;
+    }
+
+    for (const field of fields) {
+      fieldMap[field.name] = field;
+    }
+
+    const mergedFields = Object.values(fieldMap);
+    return new Schema(mergedFields, metadata);
+  }
+
 }
-exports.default = Schema;
-// Warn if any duplicated field names
+
 function checkNames(fields) {
-    const usedNames = {};
-    for (const field of fields) {
-        if (usedNames[field.name]) {
-            // eslint-disable-next-line
-            console.warn('Schema: duplicated field name', field.name, field);
-        }
-        usedNames[field.name] = true;
+  const usedNames = {};
+
+  for (const field of fields) {
+    if (usedNames[field.name]) {
+      console.warn('Schema: duplicated field name', field.name, field);
     }
+
+    usedNames[field.name] = true;
+  }
 }
+
 function mergeMaps(m1, m2) {
-    // @ts-ignore
-    return new Map([...(m1 || new Map()), ...(m2 || new Map())]);
+  return new Map([...(m1 || new Map()), ...(m2 || new Map())]);
 }
+//# sourceMappingURL=schema.js.map

package/dist/lib/schema/impl/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/lib/schema/impl/schema.ts"],"names":["assert","Schema","constructor","fields","metadata","Array","isArray","checkNames","Map","compareTo","other","length","i","select","columnNames","nameMap","Object","create","name","selectedFields","filter","field","selectAt","columnIndices","map","index","Boolean","assign","schemaOrFields","otherSchema","mergeMaps","fieldMap","mergedFields","values","usedNames","console","warn","m1","m2"],"mappings":"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","sourcesContent":["import {assert} from '../../utils/assert';\nimport Field from './field';\n\nexport type SchemaMetadata = Map<string, any>;\n\n/**\n * ArrowJS `Schema` API-compatible class for row-based tables (returned from `DataTable`)\n * https://loaders.gl/arrowjs/docs/api-reference/schema\n */\nexport default class Schema {\n  fields: Field[];\n  // TODO - Arrow just allows Map<string, string>\n  metadata: SchemaMetadata;\n\n  constructor(fields: Field[], metadata?: SchemaMetadata) {\n    assert(Array.isArray(fields));\n    checkNames(fields);\n    // For kepler fields, create arrow compatible `Fields` that have kepler fields as `metadata`\n    this.fields = fields;\n    this.metadata = metadata || new Map();\n  }\n\n  // TODO - arrow only seems to compare fields, not metadata\n  compareTo(other: Schema): boolean {\n    if (this.metadata !== other.metadata) {\n      return false;\n    }\n    if (this.fields.length !== other.fields.length) {\n      return false;\n    }\n    for (let i = 0; i < this.fields.length; ++i) {\n      if (!this.fields[i].compareTo(other.fields[i])) {\n        return false;\n      }\n    }\n    return true;\n  }\n\n  select(...columnNames: string[]): Schema {\n    // Ensure column names reference valid fields\n    const nameMap = Object.create(null);\n    for (const name of columnNames) {\n      nameMap[name] = true;\n    }\n    const selectedFields = this.fields.filter((field) => nameMap[field.name]);\n    return new Schema(selectedFields, this.metadata);\n  }\n\n  selectAt(...columnIndices: number[]): Schema {\n    // Ensure column indices reference valid fields\n    const selectedFields = columnIndices.map((index) => this.fields[index]).filter(Boolean);\n    return new Schema(selectedFields, this.metadata);\n  }\n\n  assign(schemaOrFields: Schema | Field[]): Schema {\n    let fields: Field[];\n    let metadata: SchemaMetadata = this.metadata;\n\n    if (schemaOrFields instanceof Schema) {\n      const otherSchema = schemaOrFields;\n      fields = otherSchema.fields;\n      metadata = mergeMaps(mergeMaps(new Map(), this.metadata), otherSchema.metadata);\n    } else {\n      fields = schemaOrFields;\n    }\n\n    // Create a merged list of fields, overwrite fields in place, new fields at end\n    const fieldMap: {[key: string]: Field} = Object.create(null);\n\n    for (const field of this.fields) {\n      fieldMap[field.name] = field;\n    }\n\n    for (const field of fields) {\n      fieldMap[field.name] = field;\n    }\n\n    const mergedFields = Object.values(fieldMap);\n\n    return new Schema(mergedFields, metadata);\n  }\n}\n\n// Warn if any duplicated field names\nfunction checkNames(fields: Field[]): void {\n  const usedNames: Record<string, boolean> = {};\n  for (const field of fields) {\n    if (usedNames[field.name]) {\n      // eslint-disable-next-line\n      console.warn('Schema: duplicated field name', field.name, field);\n    }\n    usedNames[field.name] = true;\n  }\n}\n\nfunction mergeMaps<T>(m1: T, m2: T): T {\n  // @ts-ignore\n  return new Map([...(m1 || new Map()), ...(m2 || new Map())]);\n}\n"],"file":"schema.js"}