clarifai-web-grpc 1.1.4 → 1.1.5

package/lib/proto/clarifai/auth/util/extension_pb.js

@@ -1,4 +1,3 @@
-"use strict";
 // source: proto/clarifai/auth/util/extension.proto
 /**
  * @fileoverview
@@ -8,9 +7,11 @@
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+
 var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
+
 var proto_clarifai_auth_scope_scope_pb = require('../../../../proto/clarifai/auth/scope/scope_pb.js');
 goog.object.extend(proto, proto_clarifai_auth_scope_scope_pb);
 var proto_clarifai_auth_types_types_pb = require('../../../../proto/clarifai/auth/types/types_pb.js');
@@ -22,59 +23,129 @@ goog.exportSymbol('proto.clarifai.auth.util.clDependingScopesList', null, global
 goog.exportSymbol('proto.clarifai.auth.util.clPrivateField', null, global);
 goog.exportSymbol('proto.clarifai.auth.util.clPrivateMessage', null, global);
 goog.exportSymbol('proto.clarifai.auth.util.clPrivateRpc', null, global);
+
 /**
  * A tuple of {field number, class constructor} for the extension
  * field named `clPrivateField`.
  * @type {!jspb.ExtensionFieldInfo<boolean>}
  */
-proto.clarifai.auth.util.clPrivateField = new jspb.ExtensionFieldInfo(80320, { clPrivateField: 0 }, null, 
-/** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (null), 0);
-google_protobuf_descriptor_pb.FieldOptions.extensionsBinary[80320] = new jspb.ExtensionFieldBinaryInfo(proto.clarifai.auth.util.clPrivateField, jspb.BinaryReader.prototype.readBool, jspb.BinaryWriter.prototype.writeBool, undefined, undefined, false);
+proto.clarifai.auth.util.clPrivateField = new jspb.ExtensionFieldInfo(
+    80320,
+    {clPrivateField: 0},
+    null,
+     /** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (
+         null),
+    0);
+
+google_protobuf_descriptor_pb.FieldOptions.extensionsBinary[80320] = new jspb.ExtensionFieldBinaryInfo(
+    proto.clarifai.auth.util.clPrivateField,
+    jspb.BinaryReader.prototype.readBool,
+    jspb.BinaryWriter.prototype.writeBool,
+    undefined,
+    undefined,
+    false);
 // This registers the extension field with the extended class, so that
 // toObject() will function correctly.
 google_protobuf_descriptor_pb.FieldOptions.extensions[80320] = proto.clarifai.auth.util.clPrivateField;
+
+
 /**
  * A tuple of {field number, class constructor} for the extension
  * field named `clPrivateRpc`.
  * @type {!jspb.ExtensionFieldInfo<boolean>}
  */
-proto.clarifai.auth.util.clPrivateRpc = new jspb.ExtensionFieldInfo(80321, { clPrivateRpc: 0 }, null, 
-/** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (null), 0);
-google_protobuf_descriptor_pb.MethodOptions.extensionsBinary[80321] = new jspb.ExtensionFieldBinaryInfo(proto.clarifai.auth.util.clPrivateRpc, jspb.BinaryReader.prototype.readBool, jspb.BinaryWriter.prototype.writeBool, undefined, undefined, false);
+proto.clarifai.auth.util.clPrivateRpc = new jspb.ExtensionFieldInfo(
+    80321,
+    {clPrivateRpc: 0},
+    null,
+     /** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (
+         null),
+    0);
+
+google_protobuf_descriptor_pb.MethodOptions.extensionsBinary[80321] = new jspb.ExtensionFieldBinaryInfo(
+    proto.clarifai.auth.util.clPrivateRpc,
+    jspb.BinaryReader.prototype.readBool,
+    jspb.BinaryWriter.prototype.writeBool,
+    undefined,
+    undefined,
+    false);
 // This registers the extension field with the extended class, so that
 // toObject() will function correctly.
 google_protobuf_descriptor_pb.MethodOptions.extensions[80321] = proto.clarifai.auth.util.clPrivateRpc;
+
+
 /**
  * A tuple of {field number, class constructor} for the extension
  * field named `clDependingScopesList`.
  * @type {!jspb.ExtensionFieldInfo<!Array<!proto.clarifai.auth.scope.S>>}
  */
-proto.clarifai.auth.util.clDependingScopesList = new jspb.ExtensionFieldInfo(80322, { clDependingScopesList: 0 }, null, 
-/** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (null), 1);
-google_protobuf_descriptor_pb.MethodOptions.extensionsBinary[80322] = new jspb.ExtensionFieldBinaryInfo(proto.clarifai.auth.util.clDependingScopesList, jspb.BinaryReader.prototype.readPackedEnum, jspb.BinaryWriter.prototype.writePackedEnum, undefined, undefined, true);
+proto.clarifai.auth.util.clDependingScopesList = new jspb.ExtensionFieldInfo(
+    80322,
+    {clDependingScopesList: 0},
+    null,
+     /** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (
+         null),
+    1);
+
+google_protobuf_descriptor_pb.MethodOptions.extensionsBinary[80322] = new jspb.ExtensionFieldBinaryInfo(
+    proto.clarifai.auth.util.clDependingScopesList,
+    jspb.BinaryReader.prototype.readPackedEnum,
+    jspb.BinaryWriter.prototype.writePackedEnum,
+    undefined,
+    undefined,
+    true);
 // This registers the extension field with the extended class, so that
 // toObject() will function correctly.
 google_protobuf_descriptor_pb.MethodOptions.extensions[80322] = proto.clarifai.auth.util.clDependingScopesList;
+
+
 /**
  * A tuple of {field number, class constructor} for the extension
  * field named `clAuthType`.
  * @type {!jspb.ExtensionFieldInfo<!proto.clarifai.auth.types.AuthType>}
  */
-proto.clarifai.auth.util.clAuthType = new jspb.ExtensionFieldInfo(80323, { clAuthType: 0 }, null, 
-/** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (null), 0);
-google_protobuf_descriptor_pb.MethodOptions.extensionsBinary[80323] = new jspb.ExtensionFieldBinaryInfo(proto.clarifai.auth.util.clAuthType, jspb.BinaryReader.prototype.readEnum, jspb.BinaryWriter.prototype.writeEnum, undefined, undefined, false);
+proto.clarifai.auth.util.clAuthType = new jspb.ExtensionFieldInfo(
+    80323,
+    {clAuthType: 0},
+    null,
+     /** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (
+         null),
+    0);
+
+google_protobuf_descriptor_pb.MethodOptions.extensionsBinary[80323] = new jspb.ExtensionFieldBinaryInfo(
+    proto.clarifai.auth.util.clAuthType,
+    jspb.BinaryReader.prototype.readEnum,
+    jspb.BinaryWriter.prototype.writeEnum,
+    undefined,
+    undefined,
+    false);
 // This registers the extension field with the extended class, so that
 // toObject() will function correctly.
 google_protobuf_descriptor_pb.MethodOptions.extensions[80323] = proto.clarifai.auth.util.clAuthType;
+
+
 /**
  * A tuple of {field number, class constructor} for the extension
  * field named `clPrivateMessage`.
  * @type {!jspb.ExtensionFieldInfo<boolean>}
  */
-proto.clarifai.auth.util.clPrivateMessage = new jspb.ExtensionFieldInfo(80324, { clPrivateMessage: 0 }, null, 
-/** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (null), 0);
-google_protobuf_descriptor_pb.MessageOptions.extensionsBinary[80324] = new jspb.ExtensionFieldBinaryInfo(proto.clarifai.auth.util.clPrivateMessage, jspb.BinaryReader.prototype.readBool, jspb.BinaryWriter.prototype.writeBool, undefined, undefined, false);
+proto.clarifai.auth.util.clPrivateMessage = new jspb.ExtensionFieldInfo(
+    80324,
+    {clPrivateMessage: 0},
+    null,
+     /** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (
+         null),
+    0);
+
+google_protobuf_descriptor_pb.MessageOptions.extensionsBinary[80324] = new jspb.ExtensionFieldBinaryInfo(
+    proto.clarifai.auth.util.clPrivateMessage,
+    jspb.BinaryReader.prototype.readBool,
+    jspb.BinaryWriter.prototype.writeBool,
+    undefined,
+    undefined,
+    false);
 // This registers the extension field with the extended class, so that
 // toObject() will function correctly.
 google_protobuf_descriptor_pb.MessageOptions.extensions[80324] = proto.clarifai.auth.util.clPrivateMessage;
+
 goog.object.extend(exports, proto.clarifai.auth.util);

package/package.json

@@ -1,28 +1,20 @@
 {
   "name": "clarifai-web-grpc",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "The official Clarifai gRPC-web client",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "require": "./dist/index.js"
-    },
-    "./resources": {
-      "import": "./lib/resources.js",
-      "require": "./dist/resources.js"
-    },
-    "./service": {
-      "import": "./lib/service.js",
-      "require": "./dist/service.js"
-    },
-    "./lib/resources": {
-      "import": "./lib/resources.js"
-    },
-    "./lib/service": {
-      "import": "./lib/service.js"
+    ".": "./lib/index.js",
+    "./resources": "./lib/resources.js",
+    "./service": "./lib/service.js"
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "lib/*"
+      ]
     }
   },
   "repository": "https://github.com/Clarifai/clarifai-web-grpc",
@@ -32,14 +24,13 @@
   "scripts": {
     "test": "mocha",
     "lint": "eslint ./src/index.ts ./src/resources.ts ./src/service.ts",
-    "clean": "rm -rf dist lib clarifai-web-grpc-*.tgz",
+    "clean": "rm -rf lib clarifai-web-grpc-*.tgz",
     "typecheck": "tsc --pretty --noEmit",
-    "build:cjs": "tsc -b tsconfig.cjs.json",
-    "build:esm": "tsc -b",
-    "build": "yarn build:esm && yarn build:cjs",
+    "build": "tsc -b && yarn copy-generated-protos",
     "prepack": "yarn clean && yarn build",
     "release": "semantic-release",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "copy-generated-protos": "cp -R src/proto src/google lib"
   },
   "dependencies": {
     "google-protobuf": "~3.14.0",

package/tests/basic.test.ts

@@ -1,41 +1,15 @@
 import { describe, it } from 'mocha'
 import { expect } from 'chai'
-import { ClarifaiStub as StubSRC } from '../src/index'
-import { ClarifaiStub as StubCJS } from '../dist/index'
-import { ClarifaiStub as StubESM } from '../lib/index'
+import { ClarifaiStub } from '../src/index'
 
-describe('Client Stub (src)', () => {
+describe('Client Stub', () => {
   it('works', () => {
-    const client = StubSRC.grpc()
+    const client = ClarifaiStub.grpc()
     expect(client.hostname_).to.equal('api-grpc-web.clarifai.com')
   })
 
   it('allows custom hostname', () => {
-    const client = StubSRC.grpc('api-dev.clarifai.com')
-    expect(client.hostname_).to.equal('api-dev.clarifai.com')
-  })
-})
-
-describe('Client Stub (cjs)', () => {
-  it('works', () => {
-    const client = StubCJS.grpc()
-    expect(client.hostname_).to.equal('api-grpc-web.clarifai.com')
-  })
-
-  it('allows custom hostname', () => {
-    const client = StubCJS.grpc('api-dev.clarifai.com')
-    expect(client.hostname_).to.equal('api-dev.clarifai.com')
-  })
-})
-
-describe('Client Stub (esm)', () => {
-  it('works', () => {
-    const client = StubESM.grpc()
-    expect(client.hostname_).to.equal('api-grpc-web.clarifai.com')
-  })
-
-  it('allows custom hostname', () => {
-    const client = StubESM.grpc('api-dev.clarifai.com')
+    const client = ClarifaiStub.grpc('api-dev.clarifai.com')
     expect(client.hostname_).to.equal('api-dev.clarifai.com')
   })
 })

package/tests/helpers.test.ts

@@ -1,47 +1,31 @@
 import { describe, it } from 'mocha'
 import { expect } from 'chai'
-import * as ResourcesSRC from '../src/resources'
-import * as ResourcesCJS from '../dist/resources'
-import * as ResourcesESM from '../lib/resources'
+import * as Resources from '../src/resources'
 
-function verifyInterface (modInterface: Record<string, unknown>) {
-  expect(modInterface.Any).to.be.instanceOf(Function)
-  expect(modInterface.Api).to.be.instanceOf(Function)
-  expect(modInterface.Duration).to.be.instanceOf(Function)
-  expect(modInterface.Empty).to.be.instanceOf(Function)
-  expect(modInterface.Struct).to.be.instanceOf(Function)
-  expect(modInterface.Timestamp).to.be.instanceOf(Function)
-  expect(modInterface.Type).to.be.instanceOf(Function)
-  expect(modInterface.Field).to.be.instanceOf(Function)
-  expect(modInterface.Enum).to.be.instanceOf(Function)
-  expect(modInterface.EnumValue).to.be.instanceOf(Function)
-  expect(modInterface.Option).to.be.instanceOf(Function)
-  expect(modInterface.DoubleValue).to.be.instanceOf(Function)
-  expect(modInterface.FloatValue).to.be.instanceOf(Function)
-  expect(modInterface.Int64Value).to.be.instanceOf(Function)
-  expect(modInterface.UInt64Value).to.be.instanceOf(Function)
-  expect(modInterface.Int32Value).to.be.instanceOf(Function)
-  expect(modInterface.UInt32Value).to.be.instanceOf(Function)
-  expect(modInterface.BoolValue).to.be.instanceOf(Function)
-  expect(modInterface.StringValue).to.be.instanceOf(Function)
-  expect(modInterface.BytesValue).to.be.instanceOf(Function)
-  expect(modInterface.BaseResponse).to.be.instanceOf(Function)
-}
-
-describe('Resources/Helpers (src)', () => {
-  it('exports various google-protobuf & grpc-web helper classes', () => {
-    verifyInterface(ResourcesSRC)
-  })
-})
-
-describe('Resources/Helpers (cjs)', () => {
-  it('exports various google-protobuf & grpc-web helper classes', () => {
-    verifyInterface(ResourcesCJS)
-  })
-})
-
-describe('Resources/Helpers (esm)', () => {
+describe('Resources/Helpers', () => {
   it('exports various google-protobuf & grpc-web helper classes', () => {
-    verifyInterface(ResourcesESM)
+    expect(Resources.Any).to.be.instanceOf(Function)
+    expect(Resources.Api).to.be.instanceOf(Function)
+    expect(Resources.Duration).to.be.instanceOf(Function)
+    expect(Resources.Empty).to.be.instanceOf(Function)
+    expect(Resources.Struct).to.be.instanceOf(Function)
+    expect(Resources.Timestamp).to.be.instanceOf(Function)
+    expect(Resources.Type).to.be.instanceOf(Function)
+    expect(Resources.Field).to.be.instanceOf(Function)
+    expect(Resources.Enum).to.be.instanceOf(Function)
+    expect(Resources.EnumValue).to.be.instanceOf(Function)
+    expect(Resources.Option).to.be.instanceOf(Function)
+    expect(Resources.DoubleValue).to.be.instanceOf(Function)
+    expect(Resources.FloatValue).to.be.instanceOf(Function)
+    expect(Resources.Int64Value).to.be.instanceOf(Function)
+    expect(Resources.UInt64Value).to.be.instanceOf(Function)
+    expect(Resources.Int32Value).to.be.instanceOf(Function)
+    expect(Resources.UInt32Value).to.be.instanceOf(Function)
+    expect(Resources.BoolValue).to.be.instanceOf(Function)
+    expect(Resources.StringValue).to.be.instanceOf(Function)
+    expect(Resources.BytesValue).to.be.instanceOf(Function)
+    expect(Resources.BaseResponse).to.be.instanceOf(Function)
+    expect(Resources.Status).to.be.instanceOf(Function)
+    expect(Resources.StatusCode).to.be.instanceOf(Object)
   })
 })

package/tsconfig.json

@@ -6,17 +6,18 @@
     "declaration": true,
     "allowJs": true,
     "outDir": "./lib",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "baseUrl": "."
   },
   "include": [
-    "./src",
+    "src"
   ],
   "exclude": [
     "node_modules"
   ],
   "ts-node": {
     "compilerOptions": {
-      "module": "CommonJS"
-    }
+      "module": "CommonJS",
+    },
   }
 }

package/dist/google/api/annotations_grpc_pb.js

@@ -1,2 +0,0 @@
-"use strict";
-// GENERATED CODE -- NO SERVICES IN PROTO

package/dist/google/api/annotations_pb.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/google/api/annotations_pb.js

@@ -1,32 +0,0 @@
-"use strict";
-// source: google/api/annotations.proto
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-/* eslint-disable */
-// @ts-nocheck
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-var google_api_http_pb = require('../../google/api/http_pb.js');
-goog.object.extend(proto, google_api_http_pb);
-var google_protobuf_descriptor_pb = require('google-protobuf/google/protobuf/descriptor_pb.js');
-goog.object.extend(proto, google_protobuf_descriptor_pb);
-goog.exportSymbol('proto.google.api.http', null, global);
-/**
- * A tuple of {field number, class constructor} for the extension
- * field named `http`.
- * @type {!jspb.ExtensionFieldInfo<!proto.google.api.HttpRule>}
- */
-proto.google.api.http = new jspb.ExtensionFieldInfo(72295728, { http: 0 }, google_api_http_pb.HttpRule, 
-/** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (google_api_http_pb.HttpRule.toObject), 0);
-google_protobuf_descriptor_pb.MethodOptions.extensionsBinary[72295728] = new jspb.ExtensionFieldBinaryInfo(proto.google.api.http, jspb.BinaryReader.prototype.readMessage, jspb.BinaryWriter.prototype.writeMessage, google_api_http_pb.HttpRule.serializeBinaryToWriter, google_api_http_pb.HttpRule.deserializeBinaryFromReader, false);
-// This registers the extension field with the extended class, so that
-// toObject() will function correctly.
-google_protobuf_descriptor_pb.MethodOptions.extensions[72295728] = proto.google.api.http;
-goog.object.extend(exports, proto.google.api);

package/dist/google/api/http_grpc_pb.js

@@ -1,2 +0,0 @@
-"use strict";
-// GENERATED CODE -- NO SERVICES IN PROTO

package/dist/google/api/http_pb.d.ts

@@ -1 +0,0 @@
-export {};