oarepo-runtime 1.5.50__py3-none-any.whl → 1.5.52__py3-none-any.whl

oarepo_runtime/cli/assets.py

@@ -79,7 +79,7 @@ def enumerate_assets():
     return aliases, asset_dirs
 
 
-COMPONENT_RE = re.compile(
+COMPONENT_LIST_RE = re.compile(
     r"""
 ^
 \s*
@@ -87,15 +87,29 @@ COMPONENT_RE = re.compile(
 \s*
 {    
 \s*
+(
+    @import\s+["'](.*?)["']
+    \s*
+    ;
+)+
+\s*
+}""",
+    re.MULTILINE | re.DOTALL | re.VERBOSE,
+)
+
+COMPONENT_RE = re.compile(
+    r"""
+\s*
 @import\s+["'](.*?)["']
 \s*
 ;
 \s*
-}""",
+""",
     re.MULTILINE | re.DOTALL | re.VERBOSE,
 )
 
 
+
 @assets.command(name="less-components")
 @click.argument("output_file", default="-")
 @with_appcontext
@@ -110,8 +124,9 @@ def less_components(output_file):
                 less_component_files.append(f)
     components = set()
     for cmp_file in less_component_files:
-        for s in COMPONENT_RE.findall(cmp_file.read_text()):
-            components.add(Path(s).stem)
+        for component_list in COMPONENT_LIST_RE.findall(cmp_file.read_text()):
+            for s in COMPONENT_RE.findall(component_list[0]):
+                components.add(Path(s).stem)
     data = {"components": list(sorted(components))}
     if output_file == "-":
         print(json.dumps(data, indent=4, ensure_ascii=False))

oarepo_runtime/info/views.py

@@ -130,7 +130,7 @@ class InfoResource(Resource):
                     "schemas": self._get_model_schemas(service),
                 }
             )
-        self.call_components("repository", data=data)
+        self.call_components("model", data=data)
         return data, 200
 
     @schema_view_args

{oarepo_runtime-1.5.50.dist-info → oarepo_runtime-1.5.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.50
+Version: 1.5.52
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.50.dist-info → oarepo_runtime-1.5.52.dist-info}/RECORD

@@ -5,7 +5,7 @@ oarepo_runtime/profile.py,sha256=QzrQoZncjoN74ZZnpkEKakNk08KCzBU7m6y42RN8AMY,163
 oarepo_runtime/proxies.py,sha256=NN_WNj1xuKc-OveoZmzvTFlUonNjSmLIGsv_JUcHGls,285
 oarepo_runtime/uow.py,sha256=iyF3R2oCPSVUu38GXoxZallgRD-619q1fWTb8sSaeyQ,4412
 oarepo_runtime/cli/__init__.py,sha256=daAODgUAB9Nb0O0Kg8vSgJIPKJm92EHMTRuoKwxBCug,373
-oarepo_runtime/cli/assets.py,sha256=C9CEwCBGeSF6ztM-T37t0XQ3KoTF0nKlhB6vTRxDt2A,3357
+oarepo_runtime/cli/assets.py,sha256=uKhR2ywDR3RgGyWXuE2X-YNG0Cx-QxXJxHkAJEVV-_Y,3589
 oarepo_runtime/cli/base.py,sha256=94RBTa8TOSPxEyEUmYLGXaWen-XktP2-MIbTtZSlCZo,544
 oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=sCe2PeokSHvNOXHFZ8YHF8NMhsu5nYjyuZuvXHJ6X18,5092
@@ -41,7 +41,7 @@ oarepo_runtime/datastreams/writers/validation_errors.py,sha256=wOCXdniR6so_4Expd
 oarepo_runtime/datastreams/writers/yaml.py,sha256=XchUJHQ58E2Mfgs8elImXbL38jFtI8Hfoye6yaR0gKI,1482
 oarepo_runtime/i18n/__init__.py,sha256=h0knW_HwiyIt5TBHfdGqN7_BBYfpz1Fw6zhVy0C28fM,111
 oarepo_runtime/info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/info/views.py,sha256=VxH6Acnif1aYnJ4HYA5hPVPX_tKme_u-LJEDiCdeU3c,11122
+oarepo_runtime/info/views.py,sha256=hgnHmNmT993zU_Id5Dsa8_u3hcUNdD6x3oXqnqWdM38,11117
 oarepo_runtime/records/__init__.py,sha256=3vzRsAPxl4d5QOnGyls-vUg4E6PunmR4ACObtacMAIQ,1038
 oarepo_runtime/records/dumpers/__init__.py,sha256=OmzNhLdMNKibmCksnj9eTX9xPBG30dziiK3j3bAAp3k,233
 oarepo_runtime/records/dumpers/edtf_interval.py,sha256=YCShZAoqBQYaxVilEVotS-jXZsxxoXO67yu2urhkaMA,1198
@@ -119,9 +119,9 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.50.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.50.dist-info/METADATA,sha256=xQpEggK1Cf6lcWFJaKCZMUMEz_T1ZmiIVGtYqoFp23k,4720
-oarepo_runtime-1.5.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-oarepo_runtime-1.5.50.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.50.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.50.dist-info/RECORD,,
+oarepo_runtime-1.5.52.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.52.dist-info/METADATA,sha256=3Cs1djLllO6XGjBGXemmgjd5G-lQi6GIeLTMFzsHlg4,4720
+oarepo_runtime-1.5.52.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+oarepo_runtime-1.5.52.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.52.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.52.dist-info/RECORD,,