Merge pull request #1723 from polywrap/origin-0.10-dev

Origin 0.10.2 | /workflows/release-pr

Author: dOrgJelli

CHANGELOG.md

@@ -1,3 +1,9 @@
+# Polywrap Origin (0.10.2)
+## Bugs
+**`@polywrap/schema-bind`:**
+* [PR-1718](https://github.com/polywrap/toolchain/pull/1718) **`plugin/python` Enum Bindings Fix**
+  * Enums are now properly displayed in Python plugins.
+
 # Polywrap Origin (0.10.1)
 ## Features
 **`@polywrap/schema-bind`:**

VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

packages/cli/package.json

@@ -81,7 +81,7 @@
     "rimraf": "3.0.2",
     "toml": "3.0.0",
     "typescript": "4.9.5",
-    "yaml": "2.1.3",
+    "yaml": "2.2.2",
     "yesno": "0.4.0"
   },
   "devDependencies": {

packages/js/manifests/polywrap/package.json

@@ -19,7 +19,7 @@
     "@polywrap/polywrap-manifest-schemas": "0.10.1",
     "jsonschema": "1.4.0",
     "semver": "7.5.0",
-    "yaml": "2.1.3"
+    "yaml": "2.2.2"
   },
   "devDependencies": {
     "@polywrap/os-js": "0.10.1",

packages/schema/bind/src/__tests__/test-cases.spec.ts

@@ -15,6 +15,8 @@ import {
 import fs from "fs";
 import path from "path";
 
+import { deepCopy } from "./utils";
+
 describe("Polywrap Binding Test Suite", () => {
   const cases = fetchTestCases();
 
@@ -38,7 +40,7 @@ describe("Polywrap Binding Test Suite", () => {
         };
 
         const output = bindSchema({
-          ...testCase.input,
+          ...deepCopy(testCase.input),
           bindLanguage: language as BindLanguage,
         });
 

packages/schema/bind/src/__tests__/utils.ts

@@ -0,0 +1,34 @@
+export function deepCopy(obj: any): any {
+  var copy;
+
+  // Handle the 3 simple types, and null or undefined
+  if (null == obj || "object" != typeof obj) return obj;
+
+  // Handle Date
+  if (obj instanceof Date) {
+      copy = new Date();
+      copy.setTime(obj.getTime());
+      return copy;
+  }
+
+  // Handle Array
+  if (obj instanceof Array) {
+      copy = [];
+      for (var i = 0, len = obj.length; i < len; i++) {
+          copy[i] = deepCopy(obj[i]);
+      }
+      return copy;
+  }
+
+  // Handle Object
+  if (obj instanceof Object) {
+      copy = {};
+      for (var attr in obj) {
+          //@ts-ignore
+          if (obj.hasOwnProperty(attr)) copy[attr] = deepCopy(obj[attr]);
+      }
+      return copy;
+  }
+
+  throw new Error("Unable to copy obj! Its type isn't supported.");
+}

packages/schema/bind/src/bindings/python/plugin/index.ts

@@ -2,6 +2,7 @@
 import * as Functions from "../functions";
 import { GenerateBindingFn, renderTemplates } from "../..";
 import { BindOptions, BindOutput } from "../../..";
+import { addEnumMembers } from "../transformers";
 
 import {
   transformAbi,
@@ -21,7 +22,7 @@ const templatePath = (subpath: string) =>
   path.join(__dirname, "./templates", subpath);
 
 const sort = (obj: Record<string, unknown>) =>
-  Object.keys(obj)
+  Object.keys(obj || {})
     .sort()
     .reduce((map: Record<string, unknown>, key: string) => {
       if (typeof obj[key] === "object") {
@@ -71,6 +72,7 @@ function applyTransforms(abi: WrapAbi): WrapAbi {
     toPrefixedGraphQLType,
     methodParentPointers(),
     interfaceUris(),
+    addEnumMembers,
   ];
 
   for (const transform of transforms) {

packages/schema/bind/src/bindings/python/plugin/templates/types-py.mustache

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import TypedDict, Optional
-from enum import IntEnum, auto
+from enum import IntEnum
 
 from polywrap_core import InvokerClient, Uri, UriPackageOrWrapper
 from polywrap_msgpack import GenericMap
@@ -36,13 +36,13 @@ from polywrap_msgpack import GenericMap
 ### Enums START ###
 {{#enumTypes}}
 class {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}}(IntEnum):
-    {{#constants}}
-    {{#detectKeyword}}{{.}}{{/detectKeyword}} = auto(), "{{.}}"
-    {{/constants}}
+    {{#members}}
+    {{#detectKeyword}}{{name}}{{/detectKeyword}} = {{value}}, "{{value}}", "{{name}}"
+    {{/members}}
 
     def __new__(cls, value: int, *aliases: str):
         obj = int.__new__(cls)
-        obj._value_ = value - 1
+        obj._value_ = value
         for alias in aliases:
             cls._value2member_map_[alias] = obj
         return obj
@@ -68,13 +68,13 @@ class {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}}(IntEn
 {{#importedEnumTypes}}
 # URI: "{{uri}}" #
 class {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}}(IntEnum):
-    {{#constants}}
-    {{#detectKeyword}}{{.}}{{/detectKeyword}} = auto()
-    {{/constants}}
+    {{#members}}
+    {{#detectKeyword}}{{name}}{{/detectKeyword}} = {{value}}, "{{value}}", "{{name}}"
+    {{/members}}
 
     def __new__(cls, value: int, *aliases: str):
         obj = int.__new__(cls)
-        obj._value_ = value - 1
+        obj._value_ = value
         for alias in aliases:
             cls._value2member_map_[alias] = obj
         return obj

packages/schema/bind/src/bindings/python/transformers.ts

@@ -0,0 +1,29 @@
+import { AbiTransforms } from "@polywrap/schema-parse";
+import { EnumDefinition } from "@polywrap/wrap-manifest-types-js";
+
+export const addEnumMembers: AbiTransforms = {
+  enter: {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    EnumDefinition: (def: EnumDefinition): EnumDefinition => {
+      if (!def.constants) {
+        return { ...def };
+      }
+
+      const members: Array<Record<string, unknown>> = [];
+      let value = 0;
+
+      for (const constant of def.constants) {
+        members.push({
+          name: constant,
+          value: value,
+        });
+        value += 1;
+      }
+
+      return {
+        ...def,
+        members,
+      } as EnumDefinition;
+    },
+  },
+};

packages/test-cases/cases/bind/sanity/output/plugin-py/types.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import TypedDict, Optional
-from enum import IntEnum, auto
+from enum import IntEnum
 
 from polywrap_core import InvokerClient, Uri, UriPackageOrWrapper
 from polywrap_msgpack import GenericMap
@@ -84,23 +84,23 @@
 
 ### Enums START ###
 class CustomEnum(IntEnum):
-    STRING = auto(), "STRING"
-    BYTES = auto(), "BYTES"
+    STRING = 0, "0", "STRING"
+    BYTES = 1, "1", "BYTES"
 
     def __new__(cls, value: int, *aliases: str):
         obj = int.__new__(cls)
-        obj._value_ = value - 1
+        obj._value_ = value
         for alias in aliases:
             cls._value2member_map_[alias] = obj
         return obj
 
 class While(IntEnum):
-    r_for = auto(), "for"
-    r_in = auto(), "in"
+    r_for = 0, "0", "for"
+    r_in = 1, "1", "in"
 
     def __new__(cls, value: int, *aliases: str):
         obj = int.__new__(cls)
-        obj._value_ = value - 1
+        obj._value_ = value
         for alias in aliases:
             cls._value2member_map_[alias] = obj
         return obj
@@ -132,24 +132,24 @@ def __new__(cls, value: int, *aliases: str):
 
 # URI: "testimport.uri.eth" #
 class TestImportEnum(IntEnum):
-    STRING = auto()
-    BYTES = auto()
+    STRING = 0, "0", "STRING"
+    BYTES = 1, "1", "BYTES"
 
     def __new__(cls, value: int, *aliases: str):
         obj = int.__new__(cls)
-        obj._value_ = value - 1
+        obj._value_ = value
         for alias in aliases:
             cls._value2member_map_[alias] = obj
         return obj
 
 # URI: "testimport.uri.eth" #
 class TestImportEnumReturn(IntEnum):
-    STRING = auto()
-    BYTES = auto()
+    STRING = 0, "0", "STRING"
+    BYTES = 1, "1", "BYTES"
 
     def __new__(cls, value: int, *aliases: str):
         obj = int.__new__(cls)
-        obj._value_ = value - 1
+        obj._value_ = value
         for alias in aliases:
             cls._value2member_map_[alias] = obj
         return obj