ssc_codegen 0.6.0__tar.gz → 0.6.1__tar.gz

{ssc_codegen-0.6.0 → ssc_codegen-0.6.1}/.idea/workspace.xml

@@ -4,8 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="456825a3-1a86-45b6-8506-2bf35bbc9370" name="Changes" comment="generated code">
-      <change beforePath="$PROJECT_DIR$/ssc_codegen/consts.py" beforeDir="false" afterPath="$PROJECT_DIR$/ssc_codegen/consts.py" afterDir="false" />
+    <list default="true" id="456825a3-1a86-45b6-8506-2bf35bbc9370" name="Changes" comment="refactoring TYPEDEF, TYPEDEF_FIELD,">
+      <change afterPath="$PROJECT_DIR$/uv.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/examples/booksToScrape/dart/booksToScrape.dart" beforeDir="false" afterPath="$PROJECT_DIR$/examples/booksToScrape/dart/booksToScrape.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/examples/booksToScrape/go/booksToScrape.go" beforeDir="false" afterPath="$PROJECT_DIR$/examples/booksToScrape/go/booksToScrape.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/examples/booksToScrape/js/booksToScrape.js" beforeDir="false" afterPath="$PROJECT_DIR$/examples/booksToScrape/js/booksToScrape.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/examples/booksToScrape/python/booksToScrape.py" beforeDir="false" afterPath="$PROJECT_DIR$/examples/booksToScrape/python/booksToScrape.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/examples/quotesToScrapeJs/parser_schema.py" beforeDir="false" afterPath="$PROJECT_DIR$/examples/quotesToScrapeJs/parser_schema.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ssc_codegen/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/ssc_codegen/__init__.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -80,40 +87,41 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Dart Command Line App.main.dart.executor&quot;: &quot;Run&quot;,
-    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
-    &quot;Python tests.pytest for test_json_converter.test_json_converter.executor&quot;: &quot;Run&quot;,
-    &quot;Python.__init__.executor&quot;: &quot;Run&quot;,
-    &quot;Python._o.executor&quot;: &quot;Debug&quot;,
-    &quot;Python.base.executor&quot;: &quot;Run&quot;,
-    &quot;Python.constants.executor&quot;: &quot;Run&quot;,
-    &quot;Python.consts.executor&quot;: &quot;Run&quot;,
-    &quot;Python.e.executor&quot;: &quot;Run&quot;,
-    &quot;Python.json_struct.executor&quot;: &quot;Run&quot;,
-    &quot;Python.json_to_schema.executor&quot;: &quot;Run&quot;,
-    &quot;Python.main (1).executor&quot;: &quot;Run&quot;,
-    &quot;Python.main.executor&quot;: &quot;Run&quot;,
-    &quot;Python.py_parsel.executor&quot;: &quot;Run&quot;,
-    &quot;Python.schema.executor&quot;: &quot;Run&quot;,
-    &quot;Python.schemas.executor&quot;: &quot;Run&quot;,
-    &quot;Python.template.executor&quot;: &quot;Run&quot;,
-    &quot;Python.tokens.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/georgiy/PycharmProjects/selector_schema_codegen&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Dart Command Line App.main.dart.executor": "Run",
+    "DefaultHtmlFileTemplate": "HTML File",
+    "Python tests.pytest for test_json_converter.test_json_converter.executor": "Run",
+    "Python.__init__.executor": "Run",
+    "Python._o.executor": "Debug",
+    "Python.base.executor": "Run",
+    "Python.constants.executor": "Run",
+    "Python.consts.executor": "Run",
+    "Python.e.executor": "Run",
+    "Python.json_struct.executor": "Run",
+    "Python.json_to_schema.executor": "Run",
+    "Python.main (1).executor": "Run",
+    "Python.main (2).executor": "Run",
+    "Python.main.executor": "Run",
+    "Python.py_parsel.executor": "Run",
+    "Python.schema.executor": "Run",
+    "Python.schemas.executor": "Run",
+    "Python.template.executor": "Run",
+    "Python.tokens.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "dart.analysis.tool.window.visible": "false",
+    "git-widget-placeholder": "main",
+    "last_opened_file_path": "/home/georgiy/PycharmProjects/selector_schema_codegen/ssc_codegen/utils",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/test_dart" />
@@ -122,13 +130,14 @@
       <recent name="$PROJECT_DIR$/ssc_codegen2/converters/templates/py/bs4" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/test_dart" />
-      <recent name="$PROJECT_DIR$/example/py" />
-      <recent name="$PROJECT_DIR$/ssc_codegen2/converters/templates/py" />
-      <recent name="$PROJECT_DIR$/ssc_codegen2/converters" />
+      <recent name="$PROJECT_DIR$/ssc_codegen" />
+      <recent name="$PROJECT_DIR$/ssc_codegen/utils" />
+      <recent name="$PROJECT_DIR$/ssc_codegen/utils/tools.py" />
+      <recent name="$PROJECT_DIR$/ssc_codegen/utils/str_utils.py" />
+      <recent name="$PROJECT_DIR$/ssc_codegen/cli" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.main (1)">
+  <component name="RunManager" selected="Python.main (2)">
     <configuration name="_o" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="selector_schema_codegen" />
       <option name="ENV_FILES" value="" />
@@ -152,7 +161,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="json_to_schema" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="main (1)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="selector_schema_codegen" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -161,12 +170,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/ssc_codegen/converters" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/quotesToScrapeJs" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/ssc_codegen/converters/json_to_schema.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/quotesToScrapeJs/main.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -175,7 +184,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="main (1)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="main (2)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="selector_schema_codegen" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -184,12 +193,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/quotesToScrapeJs" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/booksToScrape/python" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/quotesToScrapeJs/main.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/booksToScrape/python/main.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -241,11 +250,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.main (2)" />
         <item itemvalue="Python.main (1)" />
         <item itemvalue="Python._o" />
         <item itemvalue="Python tests.pytest for test_json_converter.test_json_converter" />
         <item itemvalue="Python.main" />
-        <item itemvalue="Python.json_to_schema" />
       </list>
     </recent_temporary>
   </component>
@@ -295,7 +304,7 @@
       <workItem from="1739518425156" duration="136000" />
       <workItem from="1739518577894" duration="125000" />
       <workItem from="1739530470006" duration="12800000" />
-      <workItem from="1739614174493" duration="887000" />
+      <workItem from="1739614174493" duration="13580000" />
     </task>
     <task id="LOCAL-00001" summary="first PoC">
       <option name="closed" value="true" />
@@ -617,7 +626,63 @@
       <option name="project" value="LOCAL" />
       <updated>1739569738536</updated>
     </task>
-    <option name="localTasksCounter" value="41" />
+    <task id="LOCAL-00041" summary="refactoring codebase">
+      <option name="closed" value="true" />
+      <created>1739620462724</created>
+      <option name="number" value="00041" />
+      <option name="presentableId" value="LOCAL-00041" />
+      <option name="project" value="LOCAL" />
+      <updated>1739620462724</updated>
+    </task>
+    <task id="LOCAL-00042" summary="update imports">
+      <option name="closed" value="true" />
+      <created>1739620475383</created>
+      <option name="number" value="00042" />
+      <option name="presentableId" value="LOCAL-00042" />
+      <option name="project" value="LOCAL" />
+      <updated>1739620475383</updated>
+    </task>
+    <task id="LOCAL-00043" summary="add JSON_STRUCT, JSON_STRUCT_FIELD converters">
+      <option name="closed" value="true" />
+      <created>1739621470292</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1739621470292</updated>
+    </task>
+    <task id="LOCAL-00044" summary="refactoring JSON_STRUCT, JSON_FIELD converters">
+      <option name="closed" value="true" />
+      <created>1739621509631</created>
+      <option name="number" value="00044" />
+      <option name="presentableId" value="LOCAL-00044" />
+      <option name="project" value="LOCAL" />
+      <updated>1739621509631</updated>
+    </task>
+    <task id="LOCAL-00045" summary="TypeDefField: add nested_node_ref property for find accociated StructParser node">
+      <option name="closed" value="true" />
+      <created>1739625538057</created>
+      <option name="number" value="00045" />
+      <option name="presentableId" value="LOCAL-00045" />
+      <option name="project" value="LOCAL" />
+      <updated>1739625538057</updated>
+    </task>
+    <task id="LOCAL-00046" summary="refactoring STRUCT_FIELD, TYPEDEF, TYPEDEF_FIELD">
+      <option name="closed" value="true" />
+      <created>1739625667076</created>
+      <option name="number" value="00046" />
+      <option name="presentableId" value="LOCAL-00046" />
+      <option name="project" value="LOCAL" />
+      <updated>1739625667076</updated>
+    </task>
+    <task id="LOCAL-00047" summary="refactoring TYPEDEF, TYPEDEF_FIELD,">
+      <option name="closed" value="true" />
+      <created>1739628163377</created>
+      <option name="number" value="00047" />
+      <option name="presentableId" value="LOCAL-00047" />
+      <option name="project" value="LOCAL" />
+      <updated>1739628163377</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -635,13 +700,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add new type: json&#10;&#10;ast: fix typedef parent node type" />
-    <MESSAGE value="builder: add json nodes&#10;utils: add helper function search instance" />
-    <MESSAGE value="jsonify operation" />
-    <MESSAGE value="py_parsel: &#10;  - StructFieldFunction: add JSON annotation&#10;&#10;py_base:&#10;  - implement TO_JSON, JSON_STRUCT converters&#10;  - typedef: add parse json types" />
-    <MESSAGE value="typing extension if python&lt;3.11" />
-    <MESSAGE value="schema parse json signature&#10;move Json shortcut to __init__.py" />
-    <MESSAGE value="json extract and parse example" />
     <MESSAGE value="WIP: stub json nodes" />
     <MESSAGE value="add json converter to code config" />
     <MESSAGE value="py:&#10;fix typedef type JSON gen&#10;fix json struct list[Json] convert type&#10;bs4, scrapy, selectolax: &#10;fix JSON annotation gen&#10;fix typedef JSON type gen&#10;js: add TO_JSON&#10;go: add TO_JSON, JSON_STRUCT" />
@@ -660,20 +718,21 @@
     <MESSAGE value="extract json example (quotesToScrapeJs)" />
     <MESSAGE value="ruff fmt" />
     <MESSAGE value="generated code" />
-    <option name="LAST_COMMIT_MESSAGE" value="generated code" />
+    <MESSAGE value="refactoring codebase" />
+    <MESSAGE value="update imports" />
+    <MESSAGE value="add JSON_STRUCT, JSON_STRUCT_FIELD converters" />
+    <MESSAGE value="refactoring JSON_STRUCT, JSON_FIELD converters" />
+    <MESSAGE value="TypeDefField: add nested_node_ref property for find accociated StructParser node" />
+    <MESSAGE value="refactoring STRUCT_FIELD, TYPEDEF, TYPEDEF_FIELD" />
+    <MESSAGE value="refactoring TYPEDEF, TYPEDEF_FIELD," />
+    <option name="LAST_COMMIT_MESSAGE" value="refactoring TYPEDEF, TYPEDEF_FIELD," />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/ssc_codegen/converters/py_base.py</url>
-          <line>137</line>
-          <option name="timeStamp" value="17" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/ssc_codegen/converters/templates/go.py</url>
-          <line>983</line>
-          <option name="timeStamp" value="24" />
+          <url>file://$PROJECT_DIR$/ssc_codegen/cli/cli_utils.py</url>
+          <option name="timeStamp" value="25" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -685,6 +744,7 @@
     <SUITE FILE_PATH="coverage/selector_schema_codegen$json_struct.coverage" NAME="json_struct Coverage Results" MODIFIED="1739388527238" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/ssc_codegen" />
     <SUITE FILE_PATH="coverage/selector_schema_codegen$schemas.coverage" NAME="schemas Coverage Results" MODIFIED="1715691155477" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/ssc_codegen2/schema" />
     <SUITE FILE_PATH="coverage/selector_schema_codegen$__init__.coverage" NAME="__init__ Coverage Results" MODIFIED="1715757563224" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/ssc_codegen2/document" />
+    <SUITE FILE_PATH="coverage/selector_schema_codegen$main__2_.coverage" NAME="main (2) Coverage Results" MODIFIED="1739625275679" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/examples/booksToScrape/python" />
     <SUITE FILE_PATH="coverage/selector_schema_codegen$_o.coverage" NAME="_o Coverage Results" MODIFIED="1739466687613" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/examples/tutorial/7_json_extract" />
     <SUITE FILE_PATH="coverage/selector_schema_codegen$json_to_schema.coverage" NAME="json_to_schema Coverage Results" MODIFIED="1739444979920" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/ssc_codegen/converters" />
     <SUITE FILE_PATH="coverage/selector_schema_codegen$constants.coverage" NAME="constants Coverage Results" MODIFIED="1715927681292" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/ssc_codegen2/schema" />

{ssc_codegen-0.6.0 → ssc_codegen-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssc_codegen
-Version: 0.6.0
+Version: 0.6.1
 Summary: Add your description here
 Project-URL: Documentation, https://github.com/vypivshiy/selector_schema_codegen#readme
 Project-URL: Issues, https://github.com/vypivshiy/selector_schema_codegen/issues

{ssc_codegen-0.6.0 → ssc_codegen-0.6.1}/examples/booksToScrape/dart/booksToScrape.dart

@@ -185,14 +185,14 @@ class Books {
 
 /// books.toscrape.com catalogue page entrypoint parser
 ///
-///     USAGE:
+/// USAGE:
 ///
-///         1. GET <catalog page> (https://books.toscrape.com/, https://books.toscrape.com/catalogue/page-2.html, ...)
-///         2. add another prepare instruction how to correct cook page (if needed?)
+///     1. GET <catalog page> (https://books.toscrape.com/, https://books.toscrape.com/catalogue/page-2.html, ...)
+///     2. add another prepare instruction how to correct cook page (if needed?)
 ///
-///     ISSUES:
+/// ISSUES:
 ///
-///         1. nope! Their love being scraped!
+///     1. nope! Their love being scraped!
 ///
 ///
 /// {
@@ -211,7 +211,7 @@ class Books {
 ///             "image_url": "String",
 ///             "url": "String",
 ///             "rating": "String",
-///             "price": "Any"
+///             "price": "Int"
 ///         },
 ///         "..."
 ///     ]

{ssc_codegen-0.6.0 → ssc_codegen-0.6.1}/examples/booksToScrape/go/booksToScrape.go

@@ -20,19 +20,20 @@ type TBooks struct {
 	Rating   string `json:"rating"`
 	Price    int    `json:"price"`
 }
-type TBooksITEMS = []TBooks
 type TCataloguePage struct {
-	Title   string      `json:"title"`
-	Urls    TUrls       `json:"urls"`
-	UrlsMap TUrlsMap    `json:"urls_map"`
-	Books   TBooksITEMS `json:"books"`
+	Title   string   `json:"title"`
+	Urls    TUrls    `json:"urls"`
+	UrlsMap TUrlsMap `json:"urls_map"`
+	Books   []TBooks `json:"books"`
 }
 
 // Urls fetch add patches and urls from <a> tag
 //
 // [
-//     "String",
-//     "..."
+//
+//	"String",
+//	"..."
+//
 // ]
 type Urls struct{ Document *goquery.Document }
 
@@ -65,10 +66,10 @@ func (p *Urls) Parse() (*TUrls, error) {
 
 // UrlsMap
 //
-// {
-//     "<K>": "String",
-//     "<KN>": "..."
-// }
+//	{
+//	    "<K>": "String",
+//	    "<KN>": "..."
+//	}
 type UrlsMap struct{ Document *goquery.Document }
 
 func (p *UrlsMap) splitDoc(value *goquery.Selection) (*goquery.Selection, error) {
@@ -113,14 +114,16 @@ func (p *UrlsMap) Parse() (*TUrlsMap, error) {
 // Books
 //
 // [
-//     {
-//         "name": "String",
-//         "image_url": "String",
-//         "url": "String",
-//         "rating": "String",
-//         "price": "Int"
-//     },
-//     "..."
+//
+//	{
+//	    "name": "String",
+//	    "image_url": "String",
+//	    "url": "String",
+//	    "rating": "String",
+//	    "price": "Int"
+//	},
+//	"..."
+//
 // ]
 type Books struct{ Document *goquery.Document }
 
@@ -171,7 +174,7 @@ func (p *Books) parsePrice(value *goquery.Selection) (result int, err error) {
 	value1 := value
 	value2 := value1.Find(".price_color").First()
 	value3 := value2.Text()
-	value4 := regexp.MustCompile(`(\d+)`).FindStringSubmatch(value3)[0]
+	value4 := regexp.MustCompile(`(\d+)`).FindStringSubmatch(value3)[1]
 	value5, err := strconv.Atoi(value4)
 	if err != nil {
 		panic(err)
@@ -179,8 +182,8 @@ func (p *Books) parsePrice(value *goquery.Selection) (result int, err error) {
 	result = value5
 	return result, nil
 }
-func (p *Books) Parse() (*TBooksITEMS, error) {
-	items := make(TBooksITEMS, 0)
+func (p *Books) Parse() (*[]TBooks, error) {
+	items := make([]TBooks, 0)
 	docParts, err := p.splitDoc(p.Document.Selection)
 	if err != nil {
 		return nil, err
@@ -211,37 +214,36 @@ func (p *Books) Parse() (*TBooksITEMS, error) {
 
 // CataloguePage books.toscrape.com catalogue page entrypoint parser
 //
-//     USAGE:
-//
-//         1. GET <catalog page> (https://books.toscrape.com/, https://books.toscrape.com/catalogue/page-2.html, ...)
-//         2. add another prepare instruction how to correct cook page (if needed?)
+// USAGE:
 //
-//     ISSUES:
+//  1. GET <catalog page> (https://books.toscrape.com/, https://books.toscrape.com/catalogue/page-2.html, ...)
+//  2. add another prepare instruction how to correct cook page (if needed?)
 //
-//         1. nope! Their love being scraped!
+// ISSUES:
 //
+//  1. nope! Their love being scraped!
 //
-// {
-//     "title": "String",
-//     "urls": [
-//         "String",
-//         "..."
-//     ],
-//     "urls_map": {
-//         "<K>": "String",
-//         "<KN>": "..."
-//     },
-//     "books": [
-//         {
-//             "name": "String",
-//             "image_url": "String",
-//             "url": "String",
-//             "rating": "String",
-//             "price": "Any"
-//         },
-//         "..."
-//     ]
-// }
+//	{
+//	    "title": "String",
+//	    "urls": [
+//	        "String",
+//	        "..."
+//	    ],
+//	    "urls_map": {
+//	        "<K>": "String",
+//	        "<KN>": "..."
+//	    },
+//	    "books": [
+//	        {
+//	            "name": "String",
+//	            "image_url": "String",
+//	            "url": "String",
+//	            "rating": "String",
+//	            "price": "Int"
+//	        },
+//	        "..."
+//	    ]
+//	}
 type CataloguePage struct{ Document *goquery.Document }
 
 func (p *CataloguePage) preValidate(value *goquery.Selection) (error, error) {
@@ -289,7 +291,7 @@ func (p *CataloguePage) parseUrlsMap(value *goquery.Selection) (TUrlsMap, error)
 	}
 	return *value1, nil
 }
-func (p *CataloguePage) parseBooks(value *goquery.Selection) (TBooksITEMS, error) {
+func (p *CataloguePage) parseBooks(value *goquery.Selection) ([]TBooks, error) {
 	doc0 := goquery.NewDocumentFromNode(value.Nodes[0])
 	st0 := Books{doc0}
 	value1, err := st0.Parse()

{ssc_codegen-0.6.0 → ssc_codegen-0.6.1}/examples/booksToScrape/js/booksToScrape.js

@@ -11,9 +11,9 @@
 * ]
 */
 class Urls{
-constructor(doc){this._doc = typeof document === 'string' ? new DOMParser().parseFromString(doc, 'text/html') : doc;}
+constructor(doc){if (typeof doc === 'string') {this._doc = new DOMParser().parseFromString(doc, 'text/html');}else if (doc instanceof Document || doc instanceof Element){this._doc = doc;}else{ throw new Error("Invalid input: Expected a Document, Element, or string");}}
 _splitDoc(value){
-let value1 = value.querySelectorAll('a');
+let value1 = Array.from(value.querySelectorAll('a'));
 return value1;
 }
 _parseItem(value){
@@ -32,9 +32,9 @@ let items = Array.from(this._splitDoc(this._doc)).map((e) => this._parseItem(e))
 * }
 */
 class UrlsMap{
-constructor(doc){this._doc = typeof document === 'string' ? new DOMParser().parseFromString(doc, 'text/html') : doc;}
+constructor(doc){if (typeof doc === 'string') {this._doc = new DOMParser().parseFromString(doc, 'text/html');}else if (doc instanceof Document || doc instanceof Element){this._doc = doc;}else{ throw new Error("Invalid input: Expected a Document, Element, or string");}}
 _splitDoc(value){
-let value1 = value.querySelectorAll('a');
+let value1 = Array.from(value.querySelectorAll('a'));
 return value1;
 }
 _parseKey(value){
@@ -42,7 +42,7 @@ let value1 = value.getAttribute('href');
 return value1;
 }
 _parseValue(value){
-let value1 = value.querySelector("html").innerHTML;
+let value1 = typeof value.outerHTML === "undefined" ? value.documentElement.outerHTML : value.outerHTML; 
 let value2 = (function (str, chars){return str.replace(new RegExp(`^[${chars}]+|[${chars}]+$`, 'g'), '');})(value1, ' ');
 return value2;
 }
@@ -64,9 +64,9 @@ let item = {};Array.from(this._splitDoc(this._doc)).forEach((e) =>{let k = this.
 * ]
 */
 class Books{
-constructor(doc){this._doc = typeof document === 'string' ? new DOMParser().parseFromString(doc, 'text/html') : doc;}
+constructor(doc){if (typeof doc === 'string') {this._doc = new DOMParser().parseFromString(doc, 'text/html');}else if (doc instanceof Document || doc instanceof Element){this._doc = doc;}else{ throw new Error("Invalid input: Expected a Document, Element, or string");}}
 _splitDoc(value){
-let value1 = value.querySelectorAll('.col-lg-3');
+let value1 = Array.from(value.querySelectorAll('.col-lg-3'));
 return value1;
 }
 _parseName(value){
@@ -94,8 +94,9 @@ return value3;
 _parsePrice(value){
 try {
 let value2 = value1.querySelector('.price_color');
-let value3 = value2.textContent;
-let value4 = value3.match(/(\d+)/g)[0];
+let value3 = typeof value2.textContent === "undefined" ? value2.documentElement.textContent : value2.textContent; 
+let value4 = (new RegExp(/(\d+)/g)).exec(value3)[1];
+let value5 = parseInt(value4, 10); 
 return value6;
 } catch(Error) {return 0;}
 }
@@ -105,15 +106,15 @@ let items = [];Array.from(this._splitDoc(this._doc)).forEach((e) =>{items.push({
 /**
 * books.toscrape.com catalogue page entrypoint parser
 * 
-*     USAGE:
+* USAGE:
 * 
-*         1. GET <catalog page> (https://books.toscrape.com/, https://books.toscrape.com/catalogue/page-2.html, ...)
-*         2. add another prepare instruction how to correct cook page (if needed?)
+*     1. GET <catalog page> (https://books.toscrape.com/, https://books.toscrape.com/catalogue/page-2.html, ...)
+*     2. add another prepare instruction how to correct cook page (if needed?)
 * 
-*     ISSUES:
+* ISSUES:
+* 
+*     1. nope! Their love being scraped!
 * 
-*         1. nope! Their love being scraped!
-*     
 * 
 * {
 *     "title": "String",
@@ -131,17 +132,17 @@ let items = [];Array.from(this._splitDoc(this._doc)).forEach((e) =>{items.push({
 *             "image_url": "String",
 *             "url": "String",
 *             "rating": "String",
-*             "price": "Any"
+*             "price": "Int"
 *         },
 *         "..."
 *     ]
 * }
 */
 class CataloguePage{
-constructor(doc){this._doc = typeof document === 'string' ? new DOMParser().parseFromString(doc, 'text/html') : doc;}
+constructor(doc){if (typeof doc === 'string') {this._doc = new DOMParser().parseFromString(doc, 'text/html');}else if (doc instanceof Document || doc instanceof Element){this._doc = doc;}else{ throw new Error("Invalid input: Expected a Document, Element, or string");}}
 _preValidate(value){
 let value1 = value.querySelector('title');
-let value2 = value1.textContent;
+let value2 = typeof value1.textContent === "undefined" ? value1.documentElement.textContent : value1.textContent; 
 if (value2.match(/Books to Scrape/) === null) throw new Error('');
 return null;
 }
@@ -149,7 +150,7 @@ _parseTitle(value){
 try {
 if (!value1.querySelector('title')) throw new Error('');let value2 = value1;
 let value3 = value2.querySelector('title');
-let value4 = value3.textContent;
+let value4 = typeof value3.textContent === "undefined" ? value3.documentElement.textContent : value3.textContent; 
 let value5 = value4.replace(/^\s+/g, '');
 let value6 = value5.replace(/\s+$/g, '');
 return value7;