clarifai-web-grpc 1.0.4 → 1.1.2

package/.eslintrc.yml

@@ -0,0 +1,12 @@
+env:
+  browser: true
+  es2021: true
+extends:
+  - standard
+parser: '@typescript-eslint/parser'
+parserOptions:
+  ecmaVersion: 12
+  sourceType: module
+plugins:
+  - '@typescript-eslint'
+rules: {}

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-## [1.0.4](https://github.com/Clarifai/clarifai-web-grpc/compare/v1.0.3...v1.0.4) (2022-01-10)
+## [1.1.2](https://github.com/Clarifai/clarifai-web-grpc/compare/v1.1.1...v1.1.2) (2022-01-28)
 
 
 ### Bug Fixes
 
-* package exports cjs AND esm. add linting to CI ([2084657](https://github.com/Clarifai/clarifai-web-grpc/commit/2084657bde8fdbd702cb3b6cbe5e43c26658981c))
+* remove source files from packages, and properly map entrypoints ([f66bab3](https://github.com/Clarifai/clarifai-web-grpc/commit/f66bab30da9c998881d61c7fa6bfce23e1ffa454))

package/dist/cjs/index.d.ts

@@ -3,5 +3,3 @@ export declare class ClarifaiStub {
     static grpc(hostname?: string): V2Client;
 }
 export { V2Client };
-export { Error, Metadata, ClientReadableStream } from 'grpc-web';
-export { BaseResponse } from './proto/clarifai/api/status/status_pb';

package/dist/cjs/index.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseResponse = exports.ClientReadableStream = exports.V2Client = exports.ClarifaiStub = void 0;
+exports.V2Client = exports.ClarifaiStub = void 0;
 const serviceServiceClientPb_1 = require("./proto/clarifai/api/serviceServiceClientPb");
 Object.defineProperty(exports, "V2Client", { enumerable: true, get: function () { return serviceServiceClientPb_1.V2Client; } });
 class ClarifaiStub {
-    static grpc(hostname = 'api.clarifai.com') {
+    static grpc(hostname = 'api-grpc-web.clarifai.com') {
         return new serviceServiceClientPb_1.V2Client(hostname);
     }
 }
 exports.ClarifaiStub = ClarifaiStub;
-var grpc_web_1 = require("grpc-web");
-Object.defineProperty(exports, "ClientReadableStream", { enumerable: true, get: function () { return grpc_web_1.ClientReadableStream; } });
-var status_pb_1 = require("./proto/clarifai/api/status/status_pb");
-Object.defineProperty(exports, "BaseResponse", { enumerable: true, get: function () { return status_pb_1.BaseResponse; } });

package/dist/cjs/resources.d.ts

@@ -1 +1,12 @@
 export * from './proto/clarifai/api/resources_pb';
+export { Any } from 'google-protobuf/google/protobuf/any_pb';
+export { Api } from 'google-protobuf/google/protobuf/api_pb';
+export { Duration } from 'google-protobuf/google/protobuf/duration_pb';
+export { Empty } from 'google-protobuf/google/protobuf/empty_pb';
+export { Struct } from 'google-protobuf/google/protobuf/struct_pb';
+export { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
+export { Type, Field, Enum, EnumValue, Option } from 'google-protobuf/google/protobuf/type_pb';
+export { DoubleValue, FloatValue, Int64Value, UInt64Value, Int32Value, UInt32Value, BoolValue, StringValue, BytesValue } from 'google-protobuf/google/protobuf/wrappers_pb';
+export type { Error, Metadata } from 'grpc-web';
+export { Status, BaseResponse } from './proto/clarifai/api/status/status_pb';
+export { StatusCode } from './proto/clarifai/api/status/status_code_pb';

package/dist/cjs/resources.js

@@ -10,4 +10,38 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.StatusCode = exports.BaseResponse = exports.Status = exports.BytesValue = exports.StringValue = exports.BoolValue = exports.UInt32Value = exports.Int32Value = exports.UInt64Value = exports.Int64Value = exports.FloatValue = exports.DoubleValue = exports.Option = exports.EnumValue = exports.Enum = exports.Field = exports.Type = exports.Timestamp = exports.Struct = exports.Empty = exports.Duration = exports.Api = exports.Any = void 0;
 __exportStar(require("./proto/clarifai/api/resources_pb"), exports);
+var any_pb_1 = require("google-protobuf/google/protobuf/any_pb");
+Object.defineProperty(exports, "Any", { enumerable: true, get: function () { return any_pb_1.Any; } });
+var api_pb_1 = require("google-protobuf/google/protobuf/api_pb");
+Object.defineProperty(exports, "Api", { enumerable: true, get: function () { return api_pb_1.Api; } });
+var duration_pb_1 = require("google-protobuf/google/protobuf/duration_pb");
+Object.defineProperty(exports, "Duration", { enumerable: true, get: function () { return duration_pb_1.Duration; } });
+var empty_pb_1 = require("google-protobuf/google/protobuf/empty_pb");
+Object.defineProperty(exports, "Empty", { enumerable: true, get: function () { return empty_pb_1.Empty; } });
+var struct_pb_1 = require("google-protobuf/google/protobuf/struct_pb");
+Object.defineProperty(exports, "Struct", { enumerable: true, get: function () { return struct_pb_1.Struct; } });
+var timestamp_pb_1 = require("google-protobuf/google/protobuf/timestamp_pb");
+Object.defineProperty(exports, "Timestamp", { enumerable: true, get: function () { return timestamp_pb_1.Timestamp; } });
+var type_pb_1 = require("google-protobuf/google/protobuf/type_pb");
+Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return type_pb_1.Type; } });
+Object.defineProperty(exports, "Field", { enumerable: true, get: function () { return type_pb_1.Field; } });
+Object.defineProperty(exports, "Enum", { enumerable: true, get: function () { return type_pb_1.Enum; } });
+Object.defineProperty(exports, "EnumValue", { enumerable: true, get: function () { return type_pb_1.EnumValue; } });
+Object.defineProperty(exports, "Option", { enumerable: true, get: function () { return type_pb_1.Option; } });
+var wrappers_pb_1 = require("google-protobuf/google/protobuf/wrappers_pb");
+Object.defineProperty(exports, "DoubleValue", { enumerable: true, get: function () { return wrappers_pb_1.DoubleValue; } });
+Object.defineProperty(exports, "FloatValue", { enumerable: true, get: function () { return wrappers_pb_1.FloatValue; } });
+Object.defineProperty(exports, "Int64Value", { enumerable: true, get: function () { return wrappers_pb_1.Int64Value; } });
+Object.defineProperty(exports, "UInt64Value", { enumerable: true, get: function () { return wrappers_pb_1.UInt64Value; } });
+Object.defineProperty(exports, "Int32Value", { enumerable: true, get: function () { return wrappers_pb_1.Int32Value; } });
+Object.defineProperty(exports, "UInt32Value", { enumerable: true, get: function () { return wrappers_pb_1.UInt32Value; } });
+Object.defineProperty(exports, "BoolValue", { enumerable: true, get: function () { return wrappers_pb_1.BoolValue; } });
+Object.defineProperty(exports, "StringValue", { enumerable: true, get: function () { return wrappers_pb_1.StringValue; } });
+Object.defineProperty(exports, "BytesValue", { enumerable: true, get: function () { return wrappers_pb_1.BytesValue; } });
+var status_pb_1 = require("./proto/clarifai/api/status/status_pb");
+Object.defineProperty(exports, "Status", { enumerable: true, get: function () { return status_pb_1.Status; } });
+Object.defineProperty(exports, "BaseResponse", { enumerable: true, get: function () { return status_pb_1.BaseResponse; } });
+var status_code_pb_1 = require("./proto/clarifai/api/status/status_code_pb");
+Object.defineProperty(exports, "StatusCode", { enumerable: true, get: function () { return status_code_pb_1.StatusCode; } });

package/dist/esm/index.d.ts

@@ -3,5 +3,3 @@ export declare class ClarifaiStub {
     static grpc(hostname?: string): V2Client;
 }
 export { V2Client };
-export { Error, Metadata, ClientReadableStream } from 'grpc-web';
-export { BaseResponse } from './proto/clarifai/api/status/status_pb';

package/dist/esm/index.js

@@ -1,9 +1,7 @@
 import { V2Client } from './proto/clarifai/api/serviceServiceClientPb';
 export class ClarifaiStub {
-    static grpc(hostname = 'api.clarifai.com') {
+    static grpc(hostname = 'api-grpc-web.clarifai.com') {
         return new V2Client(hostname);
     }
 }
 export { V2Client };
-export { ClientReadableStream } from 'grpc-web';
-export { BaseResponse } from './proto/clarifai/api/status/status_pb';

package/dist/esm/resources.d.ts

@@ -1 +1,12 @@
 export * from './proto/clarifai/api/resources_pb';
+export { Any } from 'google-protobuf/google/protobuf/any_pb';
+export { Api } from 'google-protobuf/google/protobuf/api_pb';
+export { Duration } from 'google-protobuf/google/protobuf/duration_pb';
+export { Empty } from 'google-protobuf/google/protobuf/empty_pb';
+export { Struct } from 'google-protobuf/google/protobuf/struct_pb';
+export { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
+export { Type, Field, Enum, EnumValue, Option } from 'google-protobuf/google/protobuf/type_pb';
+export { DoubleValue, FloatValue, Int64Value, UInt64Value, Int32Value, UInt32Value, BoolValue, StringValue, BytesValue } from 'google-protobuf/google/protobuf/wrappers_pb';
+export type { Error, Metadata } from 'grpc-web';
+export { Status, BaseResponse } from './proto/clarifai/api/status/status_pb';
+export { StatusCode } from './proto/clarifai/api/status/status_code_pb';

package/dist/esm/resources.js

@@ -1 +1,11 @@
 export * from './proto/clarifai/api/resources_pb';
+export { Any } from 'google-protobuf/google/protobuf/any_pb';
+export { Api } from 'google-protobuf/google/protobuf/api_pb';
+export { Duration } from 'google-protobuf/google/protobuf/duration_pb';
+export { Empty } from 'google-protobuf/google/protobuf/empty_pb';
+export { Struct } from 'google-protobuf/google/protobuf/struct_pb';
+export { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
+export { Type, Field, Enum, EnumValue, Option } from 'google-protobuf/google/protobuf/type_pb';
+export { DoubleValue, FloatValue, Int64Value, UInt64Value, Int32Value, UInt32Value, BoolValue, StringValue, BytesValue } from 'google-protobuf/google/protobuf/wrappers_pb';
+export { Status, BaseResponse } from './proto/clarifai/api/status/status_pb';
+export { StatusCode } from './proto/clarifai/api/status/status_code_pb';

package/package.json

@@ -1,18 +1,33 @@
 {
   "name": "clarifai-web-grpc",
-  "version": "1.0.4",
+  "version": "1.1.2",
   "description": "The official Clarifai gRPC-web client",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    },
+    "./resources": {
+      "import": "./dist/esm/resources.js",
+      "require": "./dist/cjs/resources.js"
+    },
+    "./service": {
+      "import": "./dist/esm/service.js",
+      "require": "./dist/cjs/service.js"
+    }
+  },
   "repository": "https://github.com/Clarifai/clarifai-web-grpc",
   "author": "Clarifai Inc.",
   "license": "Apache-2.0",
   "keywords": [],
   "scripts": {
     "test": "mocha",
-    "lint": "standard index.ts resources.ts service.ts",
+    "lint": "eslint index.ts resources.ts service.ts",
     "clean": "rm -rf dist 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",
@@ -32,7 +47,14 @@
     "@types/google-protobuf": "~3.7.0",
     "@types/mocha": "^9.0.0",
     "@types/node": "~10.17.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
     "chai": "^4.3.4",
+    "eslint": "^7.32.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.2.0",
     "husky": "^7.0.4",
     "mocha": "^9.1.3",
     "semantic-release": "^18.0.1",

package/tests/basic.test.ts

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

package/tests/helpers.test.ts

@@ -0,0 +1,47 @@
+import { describe, it } from 'mocha'
+import { expect } from 'chai'
+import * as ResourcesSRC from '../resources'
+import * as ResourcesCJS from '../dist/cjs/resources'
+import * as ResourcesESM from '../dist/esm/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)', () => {
+  it('exports various google-protobuf & grpc-web helper classes', () => {
+    verifyInterface(ResourcesESM)
+  })
+})

package/index.ts

@@ -1,11 +0,0 @@
-import { V2Client } from './proto/clarifai/api/serviceServiceClientPb'
-
-export class ClarifaiStub {
-  static grpc (hostname = 'api.clarifai.com') {
-    return new V2Client(hostname)
-  }
-}
-
-export { V2Client }
-export { Error, Metadata, ClientReadableStream } from 'grpc-web'
-export { BaseResponse } from './proto/clarifai/api/status/status_pb'

package/resources.ts

@@ -1 +0,0 @@
-export * from './proto/clarifai/api/resources_pb'

package/service.ts

@@ -1 +0,0 @@
-export * from './proto/clarifai/api/service_pb'